CRM-16676 post new-form cleanup

diff --git a/CRM/Activity/Form/Activity.php b/CRM/Activity/Form/Activity.php
index 696dc88404dcb41c910ca549a13513a6f6209129..edb012a73177ff3b41ad03a7284ee40c587f69ce 100644 (file)
--- a/CRM/Activity/Form/Activity.php
+++ b/CRM/Activity/Form/Activity.php
@@ -225,12 +225,6 @@ class CRM_Activity_Form_Activity extends CRM_Contact_Form_Task {
    * @return void
    */
   public function preProcess() {
-    $this->_cdType = CRM_Utils_Array::value('type', $_GET);
-    $this->assign('cdType', FALSE);
-    if ($this->_cdType) {
-      $this->assign('cdType', TRUE);
-      return CRM_Custom_Form_CustomData::preProcess($this);
-    }
     CRM_Core_Form_RecurringEntity::preProcess('civicrm_activity');
     $this->_atypefile = CRM_Utils_Array::value('atypefile', $_GET);
     $this->assign('atypefile', FALSE);
@@ -526,9 +520,6 @@ class CRM_Activity_Form_Activity extends CRM_Contact_Form_Task {
    * @return void
    */
   public function setDefaultValues() {
-    if ($this->_cdType) {
-      return CRM_Custom_Form_CustomData::setDefaultValues($this);
-    }
 
     $defaults = $this->_values + CRM_Core_Form_RecurringEntity::setDefaultValues();
     // if we're editing...
@@ -630,10 +621,6 @@ class CRM_Activity_Form_Activity extends CRM_Contact_Form_Task {
       return;
     }
 
-    if ($this->_cdType) {
-      return CRM_Custom_Form_CustomData::buildQuickForm($this);
-    }
-
     //build other activity links
     CRM_Activity_Form_ActivityLinks::commonBuildQuickForm($this);
 

diff --git a/CRM/Campaign/Form/Campaign.php b/CRM/Campaign/Form/Campaign.php
index 2fe34bcc7b089df6b036c705ff3d76e6cd9c9f44..c2dcf30314795f122fe87282194a445c8fcb13af 100644 (file)
--- a/CRM/Campaign/Form/Campaign.php
+++ b/CRM/Campaign/Form/Campaign.php
@@ -79,14 +79,6 @@ class CRM_Campaign_Form_Campaign extends CRM_Core_Form {
       CRM_Utils_System::permissionDenied();
     }
 
-    //check for custom data type.
-    $this->_cdType = CRM_Utils_Array::value('type', $_GET);
-    $this->assign('cdType', FALSE);
-    if ($this->_cdType) {
-      $this->assign('cdType', TRUE);
-      return CRM_Custom_Form_CustomData::preProcess($this);
-    }
-
     $this->_context = CRM_Utils_Request::retrieve('context', 'String', $this);
 
     $this->assign('context', $this->_context);
@@ -146,11 +138,6 @@ class CRM_Campaign_Form_Campaign extends CRM_Core_Form {
   public function setDefaultValues() {
     $defaults = $this->_values;
 
-    //load only custom data defaults.
-    if ($this->_cdType) {
-      return CRM_Custom_Form_CustomData::setDefaultValues($this);
-    }
-
     if (isset($defaults['start_date'])) {
       list($defaults['start_date'], $defaults['start_date_time'])
         = CRM_Utils_Date::setDateDefaults($defaults['start_date'], 'activityDateTime');
@@ -209,10 +196,6 @@ class CRM_Campaign_Form_Campaign extends CRM_Core_Form {
 
     $this->applyFilter('__ALL__', 'trim');
 
-    if ($this->_cdType) {
-      return CRM_Custom_Form_CustomData::buildQuickForm($this);
-    }
-
     //lets assign custom data type and subtype.
     $this->assign('customDataType', 'Campaign');
     $this->assign('entityID', $this->_campaignId);

diff --git a/CRM/Campaign/Form/Petition.php b/CRM/Campaign/Form/Petition.php
index ff73aee9691f963aa98c33cb16a9f8e5ba61a1d5..9b9c6c75cc328d9cfa907e28a625b6e5851a7ec9 100644 (file)
--- a/CRM/Campaign/Form/Petition.php
+++ b/CRM/Campaign/Form/Petition.php
@@ -67,13 +67,6 @@ class CRM_Campaign_Form_Petition extends CRM_Core_Form {
       }
     }
 
-    $this->_cdType = CRM_Utils_Array::value('type', $_GET);
-    $this->assign('cdType', FALSE);
-    if ($this->_cdType) {
-      $this->assign('cdType', TRUE);
-      return CRM_Custom_Form_CustomData::preProcess($this);
-    }
-
     // when custom data is included in this page
     if (!empty($_POST['hidden_custom'])) {
       CRM_Custom_Form_CustomData::preProcess($this);

diff --git a/CRM/Campaign/Form/Survey/Main.php b/CRM/Campaign/Form/Survey/Main.php
index c855a782629907da8258ff20ab118194208f2ee9..71024ca0f37c16b7fcf283128e8013eb35f40970 100644 (file)
--- a/CRM/Campaign/Form/Survey/Main.php
+++ b/CRM/Campaign/Form/Survey/Main.php
@@ -73,13 +73,6 @@ class CRM_Campaign_Form_Survey_Main extends CRM_Campaign_Form_Survey {
       CRM_Utils_System::setTitle(ts('Configure Survey') . ' - ' . $this->_surveyTitle);
     }
 
-    $this->_cdType = CRM_Utils_Array::value('type', $_GET);
-    $this->assign('cdType', FALSE);
-    if ($this->_cdType) {
-      $this->assign('cdType', TRUE);
-      return CRM_Custom_Form_CustomData::preProcess($this);
-    }
-
     // when custom data is included in this page
     if (!empty($_POST['hidden_custom'])) {
       CRM_Custom_Form_CustomData::preProcess($this);
@@ -115,9 +108,6 @@ class CRM_Campaign_Form_Survey_Main extends CRM_Campaign_Form_Survey {
    *   array of default values
    */
   public function setDefaultValues() {
-    if ($this->_cdType) {
-      return CRM_Custom_Form_CustomData::setDefaultValues($this);
-    }
 
     $defaults = $this->_values;
 
@@ -151,9 +141,6 @@ class CRM_Campaign_Form_Survey_Main extends CRM_Campaign_Form_Survey {
    * @return void
    */
   public function buildQuickForm() {
-    if ($this->_cdType) {
-      return CRM_Custom_Form_CustomData::buildQuickForm($this);
-    }
 
     $this->add('text', 'title', ts('Title'), CRM_Core_DAO::getAttribute('CRM_Campaign_DAO_Survey', 'title'), TRUE);
 

diff --git a/CRM/Case/Form/Activity.php b/CRM/Case/Form/Activity.php
index ecb4047ee650e3391e3f4480fa79feed459b1006..3d2437acee9f9039f1685b646e65a3c0be19e03b 100644 (file)
--- a/CRM/Case/Form/Activity.php
+++ b/CRM/Case/Form/Activity.php
@@ -87,10 +87,6 @@ class CRM_Case_Form_Activity extends CRM_Activity_Form_Activity {
     $scheduleStatusId = CRM_Core_OptionGroup::getValue('activity_status', 'Scheduled', 'name');
     $this->assign('scheduleStatusId', $scheduleStatusId);
 
-    if ($this->_cdType) {
-      return $result;
-    }
-
     if (!$this->_caseId && $this->_activityId) {
       $this->_caseId = CRM_Core_DAO::getFieldValue('CRM_Case_DAO_CaseActivity', $this->_activityId,
         'case_id', 'activity_id'
@@ -245,11 +241,6 @@ class CRM_Case_Form_Activity extends CRM_Activity_Form_Activity {
       }
       $this->assign('targetContactValues', empty($targetContactValues) ? FALSE : $targetContactValues);
 
-      //return form for ajax
-      if ($this->_cdType) {
-        return $this->_defaults;
-      }
-
       if (isset($this->_encounterMedium)) {
         $this->_defaults['medium_id'] = $this->_encounterMedium;
       }
@@ -290,10 +281,6 @@ class CRM_Case_Form_Activity extends CRM_Activity_Form_Activity {
       return;
     }
 
-    if ($this->_cdType) {
-      return $result;
-    }
-
     $this->assign('urlPath', 'civicrm/case/activity');
 
     $encounterMediums = CRM_Case_PseudoConstant::encounterMedium();

diff --git a/CRM/Case/Form/Case.php b/CRM/Case/Form/Case.php
index 30861c118ad6adf384f661f560ae554b648930e7..f5749962468f49f241a939e751f54caf4142fff9 100644 (file)
--- a/CRM/Case/Form/Case.php
+++ b/CRM/Case/Form/Case.php
@@ -92,12 +92,6 @@ class CRM_Case_Form_Case extends CRM_Core_Form {
    * @return void
    */
   public function preProcess() {
-    $this->_cdType = CRM_Utils_Array::value('type', $_GET);
-    $this->assign('cdType', FALSE);
-    if ($this->_cdType) {
-      $this->assign('cdType', TRUE);
-      return CRM_Custom_Form_CustomData::preProcess($this);
-    }
 
     $this->_caseId = CRM_Utils_Request::retrieve('id', 'Positive', $this);
 
@@ -209,7 +203,7 @@ class CRM_Case_Form_Case extends CRM_Core_Form {
    * @return void
    */
   public function setDefaultValues() {
-    if ($this->_action & CRM_Core_Action::DELETE || $this->_action & CRM_Core_Action::RENEW || $this->_cdType) {
+    if ($this->_action & CRM_Core_Action::DELETE || $this->_action & CRM_Core_Action::RENEW) {
       return TRUE;
     }
     $className = "CRM_Case_Form_Activity_{$this->_activityTypeFile}";
@@ -244,9 +238,6 @@ class CRM_Case_Form_Case extends CRM_Core_Form {
       return;
     }
 
-    if ($this->_cdType) {
-      return CRM_Custom_Form_CustomData::buildQuickForm($this);
-    }
     //need to assign custom data type and subtype to the template
     $this->assign('customDataType', 'Case');
 
@@ -302,7 +293,7 @@ class CRM_Case_Form_Case extends CRM_Core_Form {
    * @return void
    */
   public function addRules() {
-    if ($this->_action & CRM_Core_Action::DELETE || $this->_action & CRM_Core_Action::RENEW || $this->_cdType) {
+    if ($this->_action & CRM_Core_Action::DELETE || $this->_action & CRM_Core_Action::RENEW) {
       return TRUE;
     }
     $className = "CRM_Case_Form_Activity_{$this->_activityTypeFile}";

diff --git a/CRM/Contact/Form/Relationship.php b/CRM/Contact/Form/Relationship.php
index bbd1dd842d279a22f99733c07fd48fadf5e171c1..4b4eba06dfdd70711d79a6e144f498d15e2bd7e2 100644 (file)
--- a/CRM/Contact/Form/Relationship.php
+++ b/CRM/Contact/Form/Relationship.php
@@ -103,11 +103,6 @@ class CRM_Contact_Form_Relationship extends CRM_Core_Form {
    */
   public $_caseId;
 
-  /**
-   * @var mixed
-   */
-  public $_cdType;
-
   /**
    * Explicitly declare the form context.
    */
@@ -123,14 +118,6 @@ class CRM_Contact_Form_Relationship extends CRM_Core_Form {
   }
 
   public function preProcess() {
-    //custom data related code
-    $this->_cdType = CRM_Utils_Array::value('type', $_GET);
-    $this->assign('cdType', FALSE);
-    if ($this->_cdType) {
-      $this->assign('cdType', TRUE);
-      return CRM_Custom_Form_CustomData::preProcess($this);
-    }
-
     $this->_contactId = $this->get('contactId');
 
     $this->_contactType = CRM_Core_DAO::getFieldValue('CRM_Contact_DAO_Contact', $this->_contactId, 'contact_type');
@@ -218,9 +205,6 @@ class CRM_Contact_Form_Relationship extends CRM_Core_Form {
    * Set default values for the form.
    */
   public function setDefaultValues() {
-    if ($this->_cdType) {
-      return CRM_Custom_Form_CustomData::setDefaultValues($this);
-    }
 
     $defaults = array();
 
@@ -279,9 +263,6 @@ class CRM_Contact_Form_Relationship extends CRM_Core_Form {
    * Add the rules for form.
    */
   public function addRules() {
-    if ($this->_cdType) {
-      return;
-    }
 
     if (!($this->_action & CRM_Core_Action::DELETE)) {
       $this->addFormRule(array('CRM_Contact_Form_Relationship', 'dateRule'));
@@ -292,10 +273,6 @@ class CRM_Contact_Form_Relationship extends CRM_Core_Form {
    * Build the form object.
    */
   public function buildQuickForm() {
-    if ($this->_cdType) {
-      return CRM_Custom_Form_CustomData::buildQuickForm($this);
-    }
-
     if ($this->_action & CRM_Core_Action::DELETE) {
       $this->addButtons(array(
           array(

diff --git a/CRM/Contribute/Form/AbstractEditPayment.php b/CRM/Contribute/Form/AbstractEditPayment.php
index 68a96bcd40ed4bcc3671c780eb83d44ef40d0bc3..f02446abe752046d440de2f0f469ab2fd861f2af 100644 (file)
--- a/CRM/Contribute/Form/AbstractEditPayment.php
+++ b/CRM/Contribute/Form/AbstractEditPayment.php
@@ -194,11 +194,6 @@ class CRM_Contribute_Form_AbstractEditPayment extends CRM_Contact_Form_Task {
 
   protected $_formType;
 
-  /**
-   * @var mystery variable screaming out for documentation
-   */
-  protected $_cdType;
-
   /**
    * Array of fields to display on billingBlock.tpl - this is not fully implemented but basically intent is the panes/fieldsets on this page should
    * be all in this array in order like

diff --git a/CRM/Contribute/Form/Contribution.php b/CRM/Contribute/Form/Contribution.php
index a32d12bfc0c8fcebeca5858048eddcb0dd51773c..22cc3a22bbfbe4c17b148b8d285673cdffb85111 100644 (file)
--- a/CRM/Contribute/Form/Contribution.php
+++ b/CRM/Contribute/Form/Contribution.php
@@ -154,11 +154,6 @@ class CRM_Contribute_Form_Contribution extends CRM_Contribute_Form_AbstractEditP
 
   protected $_formType;
 
-  /**
-   * @todo what on earth does cdType stand for????
-   * @var
-   */
-  protected $_cdType;
   public $_honoreeProfileType;
 
   /**
@@ -225,15 +220,6 @@ class CRM_Contribute_Form_Contribution extends CRM_Contribute_Form_AbstractEditP
     if (!CRM_Core_Permission::checkActionPermission('CiviContribute', $this->_action)) {
       CRM_Core_Error::fatal(ts('You do not have permission to access this page.'));
     }
-    // @todo - if anyone ever figures out what this _cdType subroutine is about
-    // (or even if it still applies) please add comments!!!!!!!!!!
-    $this->_cdType = CRM_Utils_Array::value('type', $_GET);
-    $this->assign('cdType', FALSE);
-    if ($this->_cdType) {
-      $this->assign('cdType', TRUE);
-      CRM_Custom_Form_CustomData::preProcess($this);
-      return;
-    }
 
     parent::preProcess();
 
@@ -329,11 +315,6 @@ class CRM_Contribute_Form_Contribution extends CRM_Contribute_Form_AbstractEditP
    * @return array
    */
   public function setDefaultValues() {
-    if ($this->_cdType) {
-      // @todo document when this function would be called in this way
-      // (and whether it is valid or an overloading of this form).
-      return CRM_Custom_Form_CustomData::setDefaultValues($this);
-    }
 
     $defaults = $this->_values;
 
@@ -486,11 +467,6 @@ class CRM_Contribute_Form_Contribution extends CRM_Contribute_Form_AbstractEditP
    */
   public function buildQuickForm() {
 
-    //@todo document the purpose of cdType (if still in use)
-    if ($this->_cdType) {
-      CRM_Custom_Form_CustomData::buildQuickForm($this);
-      return;
-    }
     $allPanes = array();
     $recurJs = NULL;
     //tax rate from financialType

diff --git a/CRM/Contribute/Form/Contribution/Main.php b/CRM/Contribute/Form/Contribution/Main.php
index a5b870b4015f7d4153257125630ba280899569e5..0379525fd1019939d1336058283b30f32168a37d 100644 (file)
--- a/CRM/Contribute/Form/Contribution/Main.php
+++ b/CRM/Contribute/Form/Contribution/Main.php
@@ -377,12 +377,6 @@ class CRM_Contribute_Form_Contribution_Main extends CRM_Contribute_Form_Contribu
     // Build payment processor form
     if (empty($_GET['onbehalf'])) {
       CRM_Core_Payment_ProcessorForm::buildQuickForm($this);
-      // Return if we are in an ajax - this is probably redundant now as
-      // processor does not call this form for a snippet anymore - but unsure about
-      // cdType
-      if ($this->_snippet) {
-        return;
-      }
     }
 
     $config = CRM_Core_Config::singleton();

diff --git a/CRM/Event/Form/ManageEvent/EventInfo.php b/CRM/Event/Form/ManageEvent/EventInfo.php
index d41bdd13db8e20dc654929140af6df4d7d96f6aa..d5483dd8f1ec8d8715172ec31564bb63e8b598b9 100644 (file)
--- a/CRM/Event/Form/ManageEvent/EventInfo.php
+++ b/CRM/Event/Form/ManageEvent/EventInfo.php
@@ -51,14 +51,7 @@ class CRM_Event_Form_ManageEvent_EventInfo extends CRM_Event_Form_ManageEvent {
    * @return void
    */
   public function preProcess() {
-    //custom data related code
-    $this->_cdType = CRM_Utils_Array::value('type', $_GET);
-    $this->assign('cdType', FALSE);
-    if ($this->_cdType) {
-      $this->assign('cdType', TRUE);
-      return CRM_Custom_Form_CustomData::preProcess($this);
-    }
-    parent::preProcess();
+     parent::preProcess();
 
     if ($this->_id) {
       $this->assign('entityID', $this->_id);
@@ -92,18 +85,6 @@ class CRM_Event_Form_ManageEvent_EventInfo extends CRM_Event_Form_ManageEvent {
    * @return void
    */
   public function setDefaultValues() {
-    if ($this->_cdType) {
-      $tempId = (int) CRM_Utils_Request::retrieve('template_id', 'Integer', $this);
-      // set template custom data as a default for event, CRM-5596
-      if ($tempId && !$this->_id) {
-        $defaults = $this->templateCustomDataValues($tempId);
-      }
-      else {
-        $defaults = CRM_Custom_Form_CustomData::setDefaultValues($this);
-      }
-
-      return $defaults;
-    }
     $defaults = parent::setDefaultValues();
 
     // in update mode, we need to set custom data subtype to tpl
@@ -153,9 +134,6 @@ class CRM_Event_Form_ManageEvent_EventInfo extends CRM_Event_Form_ManageEvent {
    * @return void
    */
   public function buildQuickForm() {
-    if ($this->_cdType) {
-      return CRM_Custom_Form_CustomData::buildQuickForm($this);
-    }
     //need to assign custom data type and subtype to the template
     $this->assign('customDataType', 'Event');
     if ($this->_eventType) {

diff --git a/CRM/Event/Form/Participant.php b/CRM/Event/Form/Participant.php
index cd4a5497f6e924af1aae8662d73475c274460905..1645a8ee525e93dbc580aeb22aac4a5c1e62f702 100644 (file)
--- a/CRM/Event/Form/Participant.php
+++ b/CRM/Event/Form/Participant.php
@@ -279,14 +279,6 @@ class CRM_Event_Form_Participant extends CRM_Contribute_Form_AbstractEditPayment
       return CRM_Event_Form_EventFees::preProcess($this);
     }
 
-    //custom data related code
-    $this->_cdType = CRM_Utils_Array::value('type', $_GET);
-    $this->assign('cdType', FALSE);
-    if ($this->_cdType) {
-      $this->assign('cdType', TRUE);
-      return CRM_Custom_Form_CustomData::preProcess($this, NULL, NULL, NULL, NULL, NULL, TRUE);
-    }
-
     //check the mode when this form is called either single or as
     //search task action
     if ($this->_id || $this->_contactId || $this->_context == 'standalone') {
@@ -429,10 +421,6 @@ class CRM_Event_Form_Participant extends CRM_Contribute_Form_AbstractEditPayment
       return CRM_Event_Form_EventFees::setDefaultValues($this);
     }
 
-    if ($this->_cdType) {
-      return CRM_Custom_Form_CustomData::setDefaultValues($this);
-    }
-
     $defaults = array();
 
     if ($this->_action & CRM_Core_Action::DELETE) {
@@ -601,10 +589,6 @@ class CRM_Event_Form_Participant extends CRM_Contribute_Form_AbstractEditPayment
       return CRM_Event_Form_EventFees::buildQuickForm($this);
     }
 
-    if ($this->_cdType) {
-      return CRM_Custom_Form_CustomData::buildQuickForm($this);
-    }
-
     //need to assign custom data type to the template
     $this->assign('customDataType', 'Participant');
 

diff --git a/CRM/Grant/Form/Grant.php b/CRM/Grant/Form/Grant.php
index 5dbc0782491f0b9307c724d9bb33fa83cb2922e7..a976a3eb9545abe9e4d31abe00c25e7947580d37 100644 (file)
--- a/CRM/Grant/Form/Grant.php
+++ b/CRM/Grant/Form/Grant.php
@@ -68,14 +68,6 @@ class CRM_Grant_Form_Grant extends CRM_Core_Form {
    * @return void
    */
   public function preProcess() {
-    //custom data related code
-    $this->_cdType = CRM_Utils_Array::value('type', $_GET);
-    $this->assign('cdType', FALSE);
-    if ($this->_cdType) {
-      $this->assign('cdType', TRUE);
-      CRM_Custom_Form_CustomData::preProcess($this);
-      return;
-    }
 
     $this->_contactID = CRM_Utils_Request::retrieve('cid', 'Positive', $this);
     $this->_id = CRM_Utils_Request::retrieve('id', 'Positive', $this);
@@ -124,9 +116,6 @@ class CRM_Grant_Form_Grant extends CRM_Core_Form {
    * @return array
    */
   public function setDefaultValues() {
-    if ($this->_cdType) {
-      return CRM_Custom_Form_CustomData::setDefaultValues($this);
-    }
 
     $defaults = parent::setDefaultValues();
 
@@ -178,9 +167,6 @@ class CRM_Grant_Form_Grant extends CRM_Core_Form {
    * @return void
    */
   public function buildQuickForm() {
-    if ($this->_cdType) {
-      return CRM_Custom_Form_CustomData::buildQuickForm($this);
-    }
 
     if ($this->_action & CRM_Core_Action::DELETE) {
       $this->addButtons(array(

diff --git a/CRM/Member/Form/Membership.php b/CRM/Member/Form/Membership.php
index 46a327e6eb3c5a69e2738f265c4a47858dcace2d..3797db6b739bd7ffa8dc3608c631105857e1cab8 100644 (file)
--- a/CRM/Member/Form/Membership.php
+++ b/CRM/Member/Form/Membership.php
@@ -173,13 +173,6 @@ class CRM_Member_Form_Membership extends CRM_Member_Form {
    * @throws \Exception
    */
   public function preProcess() {
-    //custom data related code
-    $this->_cdType = CRM_Utils_Array::value('type', $_GET);
-    $this->assign('cdType', FALSE);
-    if ($this->_cdType) {
-      $this->assign('cdType', TRUE);
-      return CRM_Custom_Form_CustomData::preProcess($this);
-    }
     // This string makes up part of the class names, differentiating them (not sure why) from the membership fields.
     $this->assign('formClass', 'membership');
     parent::preProcess();
@@ -275,9 +268,6 @@ class CRM_Member_Form_Membership extends CRM_Member_Form {
    * Set default values for the form.
    */
   public function setDefaultValues() {
-    if ($this->_cdType) {
-      return CRM_Custom_Form_CustomData::setDefaultValues($this);
-    }
 
     if ($this->_priceSetId) {
       return CRM_Price_BAO_PriceSet::setDefaultPriceSet($this, $defaults);
@@ -426,9 +416,6 @@ class CRM_Member_Form_Membership extends CRM_Member_Form {
    * Build the form object.
    */
   public function buildQuickForm() {
-    if ($this->_cdType) {
-      return CRM_Custom_Form_CustomData::buildQuickForm($this);
-    }
 
     $this->assign('taxRates', json_encode(CRM_Core_PseudoConstant::getTaxRates()));
 

diff --git a/CRM/Member/Form/MembershipRenewal.php b/CRM/Member/Form/MembershipRenewal.php
index 0314ba27e420015b91f298e346ff04ed15ebb94f..9b981df44f0f86ca7b28b735f22ee19036b2486a 100644 (file)
--- a/CRM/Member/Form/MembershipRenewal.php
+++ b/CRM/Member/Form/MembershipRenewal.php
@@ -102,13 +102,6 @@ class CRM_Member_Form_MembershipRenewal extends CRM_Member_Form {
   );
 
   public function preProcess() {
-    //custom data related code
-    $this->_cdType = CRM_Utils_Array::value('type', $_GET);
-    $this->assign('cdType', FALSE);
-    if ($this->_cdType) {
-      $this->assign('cdType', TRUE);
-      CRM_Custom_Form_CustomData::preProcess($this);
-    }
 
     // This string makes up part of the class names, differentiating them (not sure why) from the membership fields.
     $this->assign('formClass', 'membershiprenew');
@@ -160,9 +153,6 @@ class CRM_Member_Form_MembershipRenewal extends CRM_Member_Form {
    *   Default values.
    */
   public function setDefaultValues() {
-    if ($this->_cdType) {
-      return CRM_Custom_Form_CustomData::setDefaultValues($this);
-    }
 
     $defaults = parent::setDefaultValues();
     $this->_memType = $defaults['membership_type_id'];
@@ -242,9 +232,6 @@ class CRM_Member_Form_MembershipRenewal extends CRM_Member_Form {
    * Build the form object.
    */
   public function buildQuickForm() {
-    if ($this->_cdType) {
-      CRM_Custom_Form_CustomData::buildQuickForm($this);
-    }
 
     parent::buildQuickForm();
 

diff --git a/templates/CRM/Activity/Form/Activity.tpl b/templates/CRM/Activity/Form/Activity.tpl
index 8d0d60b2be56d15fa30f50eb8acb373fea606cfa..760acdc5de0974fb4a5e08fe13838d0b22b1f3f4 100644 (file)
--- a/templates/CRM/Activity/Form/Activity.tpl
+++ b/templates/CRM/Activity/Form/Activity.tpl
@@ -24,9 +24,6 @@
  +--------------------------------------------------------------------+
 *}
 {* this template is used for adding/editing other (custom) activities. *}
-{if $cdType }
-  {include file="CRM/Custom/Form/CustomData.tpl"}
-{else}
   {if $action eq 4}
     <div class="crm-block crm-content-block crm-activity-view-block">
   {else}
@@ -294,5 +291,5 @@
     {/literal}
   {/if}
   </div>{* end of form block*}
-{/if} {* end of snippet if*}
+
 {include file="CRM/Event/Form/ManageEvent/ConfirmRepeatMode.tpl" entityID=$activityId entityTable="civicrm_activity"}

diff --git a/templates/CRM/Activity/Form/ActivityLinks.tpl b/templates/CRM/Activity/Form/ActivityLinks.tpl
index 28fa38cfb4a7f35aa26b52529516b3d979897cbb..8b1b89ed505420bcb71c2ec2100930c905471d45 100644 (file)
--- a/templates/CRM/Activity/Form/ActivityLinks.tpl
+++ b/templates/CRM/Activity/Form/ActivityLinks.tpl
@@ -24,7 +24,7 @@
  +--------------------------------------------------------------------+
 *}
 {* Links for scheduling/logging meetings and calls and Sending Email *}
-{if $cdType eq false }
+
 {if $contact_id }
 {assign var = "contactId" value= $contact_id }
 {/if}
@@ -77,5 +77,3 @@
 </ul>
 
 {/if}
-
-{/if}

diff --git a/templates/CRM/Campaign/Form/Campaign.tpl b/templates/CRM/Campaign/Form/Campaign.tpl
index 7b7447b14840a74036a6078042c3e736bff53cf1..a951d6366c89e099cc846cfae2289a1aaf309d30 100644 (file)
--- a/templates/CRM/Campaign/Form/Campaign.tpl
+++ b/templates/CRM/Campaign/Form/Campaign.tpl
@@ -25,10 +25,6 @@
 *}
 <div class="crm-block crm-form-block crm-campaign-form-block">
 
-{* load the custom data *}
-{if $cdType}
-    {include file="CRM/Custom/Form/CustomData.tpl"}
-{else}
 
 {if $action eq 8}
   <table class="form-layout">
@@ -122,7 +118,3 @@
   });
 </script>
 {/literal}
-
-
-{/if} {* load custom data *}
-

diff --git a/templates/CRM/Campaign/Form/Survey/Main.tpl b/templates/CRM/Campaign/Form/Survey/Main.tpl
index 93dd5416ad8cef282cf4ddda40e90ece294d8d55..dbfa34d5cf3d4e746fcac51fa2823eb0de4c6127 100644 (file)
--- a/templates/CRM/Campaign/Form/Survey/Main.tpl
+++ b/templates/CRM/Campaign/Form/Survey/Main.tpl
@@ -24,9 +24,6 @@
  +--------------------------------------------------------------------+
 *}
 
-{if $cdType }
-   {include file="CRM/Custom/Form/CustomData.tpl"}
-{else}
 <div class="crm-block crm-form-block crm-campaign-survey-main-form-block">
 <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
   {if $action  eq 1}
@@ -116,5 +113,3 @@
     });
   </script>
 {/literal}
-
-{/if}

diff --git a/templates/CRM/Case/Form/Activity.tpl b/templates/CRM/Case/Form/Activity.tpl
index a11869b66800d4c82aa7d3b6b316e9f4a5f90f70..763e57fdb9d50ce9b4568130bc410473e6638c37 100644 (file)
--- a/templates/CRM/Case/Form/Activity.tpl
+++ b/templates/CRM/Case/Form/Activity.tpl
@@ -25,9 +25,6 @@
 *}
 
 {* this template is used for adding/editing activities for a case. *}
-{if $cdType }
-  {include file="CRM/Custom/Form/CustomData.tpl"}
-{else}
 <div class="crm-block crm-form-block crm-case-activity-form-block">
 
   {if $action neq 8 and $action  neq 32768 }
@@ -307,4 +304,3 @@
     {/literal}
   {/if}
 </div>
-{/if} {* end of main if block*}

diff --git a/templates/CRM/Case/Form/Case.tpl b/templates/CRM/Case/Form/Case.tpl
index a693ee142ef779d897410964339a541c723a6166..f640c5ab2bda564c3928a382f59adc4cbe3c0f52 100644 (file)
--- a/templates/CRM/Case/Form/Case.tpl
+++ b/templates/CRM/Case/Form/Case.tpl
@@ -29,10 +29,6 @@
 *}
 <div class="crm-block crm-form-block crm-case-form-block">
 
-{if $cdType }
-   {include file="CRM/Custom/Form/CustomData.tpl"}
-{else}
-
 {if $action neq 8 && $action neq 32768}
 <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
 {/if}
@@ -147,5 +143,4 @@
 
 <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
 
-{/if}
 </div>

diff --git a/templates/CRM/Contact/Form/CustomData.tpl b/templates/CRM/Contact/Form/CustomData.tpl
index 2181c5febf388f2221e3654a5a4b3d0d8c4f30eb..f577ee5eefcf4542f87978088e59ece12e5b05fd 100644 (file)
--- a/templates/CRM/Contact/Form/CustomData.tpl
+++ b/templates/CRM/Contact/Form/CustomData.tpl
@@ -24,7 +24,7 @@
  +--------------------------------------------------------------------+
 *}
 {* this template is used for building tabbed custom data *}
-{if $cdType || $postedInfo}
+{if $postedInfo}
    {include file="CRM/Custom/Form/CustomData.tpl"}
    {if $multiRecordDisplay eq 'single'}
      <div class="crm-submit-buttons">{$form.buttons.html}</div>

diff --git a/templates/CRM/Contact/Form/Relationship.tpl b/templates/CRM/Contact/Form/Relationship.tpl
index a5fe163a18d2e5379e0b27eda97ec0cbecd4314d..07aebea94d202112c794f4743a50a838e79592c8 100644 (file)
--- a/templates/CRM/Contact/Form/Relationship.tpl
+++ b/templates/CRM/Contact/Form/Relationship.tpl
@@ -24,9 +24,7 @@
  +--------------------------------------------------------------------+
 *}
 {* this template is used for adding/editing/viewing relationships  *}
-{if $cdType }
-  {include file="CRM/Custom/Form/CustomData.tpl"}
-{else}
+
   {if $action eq 4 } {* action = view *}
     <div class="crm-block crm-content-block crm-relationship-view-block">
       <table class="crm-info-panel">
@@ -204,5 +202,3 @@
     </div>
   {/if}
   <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
-{/if} {* close of custom data else*}
-

diff --git a/templates/CRM/Contact/Page/View/Relationship.tpl b/templates/CRM/Contact/Page/View/Relationship.tpl
index addd909c70980bd9549f88cc6c9599b1a697d07c..b13860cb1643c5093eb012e46844fead21d4c946 100644 (file)
--- a/templates/CRM/Contact/Page/View/Relationship.tpl
+++ b/templates/CRM/Contact/Page/View/Relationship.tpl
@@ -24,9 +24,7 @@
  +--------------------------------------------------------------------+
 *}
 {* Relationship tab within View Contact - browse, and view relationships for a contact *}
-{if !empty($cdType) }
-  {include file="CRM/Custom/Form/CustomData.tpl"}
-{elseif $action neq 16} {* add, update or view *}
+{if $action neq 16} {* add, update or view *}
   {include file="CRM/Contact/Form/Relationship.tpl"}
 {else}
   <div id="contact-summary-relationship-tab" class="view-content">

diff --git a/templates/CRM/Contribute/Form/Contribution.tpl b/templates/CRM/Contribute/Form/Contribution.tpl
index 8471911d09b619394bef67de105fbcf81d6c20fc..298fd31674de08dd71dd69d2e862c14d5c8bb7f7 100644 (file)
--- a/templates/CRM/Contribute/Form/Contribution.tpl
+++ b/templates/CRM/Contribute/Form/Contribution.tpl
@@ -25,9 +25,7 @@
 *}
 {* this template is used for adding/editing/deleting contributions and pledge payments *}
 
-{if $cdType}
-  {include file="CRM/Custom/Form/CustomData.tpl"}
-{elseif $priceSetId}
+{if $priceSetId}
   {include file="CRM/Price/Form/PriceSet.tpl" context="standalone" extends="Contribution"}
 {elseif $showAdditionalInfo and $formType }
   {include file="CRM/Contribute/Form/AdditionalInfo/$formType.tpl"}

diff --git a/templates/CRM/Event/Form/ManageEvent/EventInfo.tpl b/templates/CRM/Event/Form/ManageEvent/EventInfo.tpl
index 01f6a70344f8a1c52c7e621994aad86cd9ffbd88..7315df2b11580f7b37271dbe5cb4ec76c9ab6923 100644 (file)
--- a/templates/CRM/Event/Form/ManageEvent/EventInfo.tpl
+++ b/templates/CRM/Event/Form/ManageEvent/EventInfo.tpl
@@ -26,9 +26,6 @@
 {* Step 1 of New Event Wizard, and Edit Event Info form. *}
 
 <div class="crm-block crm-form-block crm-event-manage-eventinfo-form-block">
-{if $cdType}
-  {include file="CRM/Custom/Form/CustomData.tpl"}
-{else}
   {assign var=eventID value=$id}
         <div class="crm-submit-buttons">
         {include file="CRM/common/formButtons.tpl" location="top"}
@@ -171,7 +168,6 @@
     {include file="CRM/common/showHide.tpl" elemType="table-row"}
 
     {include file="CRM/Form/validate.tpl"}
-{/if}
 </div>
 {literal}
 <script type="text/javascript">

diff --git a/templates/CRM/Event/Form/Participant.tpl b/templates/CRM/Event/Form/Participant.tpl
index cc0b859d852202da32a9821ef76c78a9a1f33b89..9d0950733ceadcbb824d68e8097314e1cff5e9ad 100644 (file)
--- a/templates/CRM/Event/Form/Participant.tpl
+++ b/templates/CRM/Event/Form/Participant.tpl
@@ -170,10 +170,6 @@
 
   {include file="CRM/Event/Form/EventFees.tpl"}
 
-{* Ajax callback for custom data snippet *}
-{elseif $cdType}
-  {include file="CRM/Custom/Form/CustomData.tpl"}
-
 {* Main event form template *}
 {else}
   {if $participantMode == 'test' }

diff --git a/templates/CRM/Grant/Form/Grant.tpl b/templates/CRM/Grant/Form/Grant.tpl
index 960866d069385b92c9af948fca4a068aa693de47..be54d607834ac07e3c5324c3cab8bff8766112a9 100644 (file)
--- a/templates/CRM/Grant/Form/Grant.tpl
+++ b/templates/CRM/Grant/Form/Grant.tpl
@@ -25,10 +25,6 @@
 *}
 {* this template is used for adding/editing/deleting grant *}
 
-{if $cdType}
-  {include file="CRM/Custom/Form/CustomData.tpl"}
-{else}
-
 <div class="crm-block crm-form-block crm-grant-form-block">
   {if $action eq 8}
      <div class="messages status">
@@ -135,5 +131,3 @@
    {/if}
  <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
 </div>
-
-{/if} {* closing of main custom data if *}

diff --git a/templates/CRM/Member/Form/Membership.tpl b/templates/CRM/Member/Form/Membership.tpl
index c81680cfd34ae6b74ed2f10cc2a88a2e5c95670c..6a9bfaec76798684a6be42002ef3ef441309cf62 100644 (file)
--- a/templates/CRM/Member/Form/Membership.tpl
+++ b/templates/CRM/Member/Form/Membership.tpl
@@ -31,9 +31,7 @@
   </div>
 {/if}
 <div class="spacer"></div>
-{if $cdType }
-  {include file="CRM/Custom/Form/CustomData.tpl"}
-{elseif $priceSetId}
+{if $priceSetId}
   {include file="CRM/Price/Form/PriceSet.tpl" context="standalone" extends="Membership"}
   {literal}
   <script type="text/javascript">

diff --git a/templates/CRM/Member/Form/MembershipRenewal.tpl b/templates/CRM/Member/Form/MembershipRenewal.tpl
index e5ec91cc8f24a8c7e2d333fa1c0a7662798d615d..1e8615fd95d8cbdff4bc7b6a6e66e0e36934e8ed 100644 (file)
--- a/templates/CRM/Member/Form/MembershipRenewal.tpl
+++ b/templates/CRM/Member/Form/MembershipRenewal.tpl
@@ -24,9 +24,6 @@
  +--------------------------------------------------------------------+
 *}
 {* this template is used for renewing memberships for a contact  *}
-{if $cdType }
-  {include file="CRM/Custom/Form/CustomData.tpl"}
-{else}
   {if $membershipMode == 'test' }
     {assign var=registerMode value="TEST"}
   {elseif $membershipMode == 'live'}
@@ -320,4 +317,3 @@
     }
   </script>
 {/literal}
-{/if}{* closing of custom data if *}

diff --git a/templates/CRM/Pledge/Form/Pledge.tpl b/templates/CRM/Pledge/Form/Pledge.tpl
index 9682af08ceeed9fcac912661a5ed4376463baf81..4debf9ff1d51317a5a5a1c8c86c1c95482d90da2 100644 (file)
--- a/templates/CRM/Pledge/Form/Pledge.tpl
+++ b/templates/CRM/Pledge/Form/Pledge.tpl
@@ -24,9 +24,7 @@
  +--------------------------------------------------------------------+
 *}
 {* this template is used for adding/editing/deleting pledge *}
-{if $cdType}
-  {include file="CRM/Custom/Form/CustomData.tpl"}
-{elseif $showAdditionalInfo and $formType }
+{if $showAdditionalInfo and $formType }
   {include file="CRM/Contribute/Form/AdditionalInfo/$formType.tpl"}
 {else}
 {if !$email and $action neq 8 and $context neq 'standalone'}