From 1c88e578623d8b2f94baa36e0f7dfeadbb1f2e2a Mon Sep 17 00:00:00 2001
From: eileen <eileen@fuzion.co.nz>
Date: Mon, 13 May 2013 14:28:19 +1200
Subject: [PATCH] CRM-12595 fix formatting in api files

---
 api/class.api.php                     |  1 -
 api/v2/Case.php                       | 10 +++++-----
 api/v2/Contact.php                    |  2 +-
 api/v3/ActivityType.php               |  3 +--
 api/v3/Address.php                    |  1 -
 api/v3/Batch.php                      |  1 -
 api/v3/Campaign.php                   |  3 +--
 api/v3/Case.php                       |  1 -
 api/v3/Constant.php                   |  1 -
 api/v3/ContactType.php                |  1 -
 api/v3/Contribution.php               |  1 -
 api/v3/ContributionRecur.php          |  2 +-
 api/v3/CustomField.php                | 15 +++++++--------
 api/v3/CustomGroup.php                |  1 -
 api/v3/CustomValue.php                |  1 -
 api/v3/Domain.php                     |  1 -
 api/v3/Email.php                      |  3 +--
 api/v3/Entity.php                     |  1 -
 api/v3/EntityTag.php                  |  1 -
 api/v3/Event.php                      |  1 -
 api/v3/Extension.php                  |  1 -
 api/v3/File.php                       |  1 -
 api/v3/Generic.php                    |  1 -
 api/v3/Generic/Getactions.php         | 27 ++++++++++++++++++++++++++-
 api/v3/Generic/Update.php             | 27 ++++++++++++++++++++++++++-
 api/v3/Grant.php                      |  1 -
 api/v3/Group.php                      |  1 -
 api/v3/GroupNesting.php               |  3 +--
 api/v3/GroupOrganization.php          |  3 +--
 api/v3/Location.php                   |  1 -
 api/v3/LocationType.php               |  1 -
 api/v3/MailSettings.php               |  1 -
 api/v3/Mailing.php                    |  1 -
 api/v3/MailingEventConfirm.php        |  3 +--
 api/v3/MailingEventResubscribe.php    |  3 +--
 api/v3/MailingEventSubscribe.php      |  3 +--
 api/v3/MailingEventUnsubscribe.php    |  3 +--
 api/v3/MailingGroup.php               |  1 -
 api/v3/MailingJob.php                 |  1 -
 api/v3/MailingRecipients.php          |  1 -
 api/v3/Membership.php                 |  1 -
 api/v3/MembershipPayment.php          |  3 +--
 api/v3/MembershipStatus.php           |  1 -
 api/v3/MembershipType.php             |  3 +--
 api/v3/Note.php                       |  5 ++---
 api/v3/OptionGroup.php                |  3 +--
 api/v3/OptionValue.php                |  1 -
 api/v3/Participant.php                |  1 -
 api/v3/ParticipantPayment.php         |  3 +--
 api/v3/ParticipantStatusType.php      |  1 -
 api/v3/PaymentProcessorType.php       |  1 -
 api/v3/Phone.php                      |  3 +--
 api/v3/Phone/Get.php                  |  1 -
 api/v3/Pledge.php                     | 19 +++++++++----------
 api/v3/PledgePayment.php              |  1 -
 api/v3/Profile.php                    |  1 -
 api/v3/Relationship.php               |  1 -
 api/v3/RelationshipType.php           |  3 +--
 api/v3/Survey.php                     |  1 -
 api/v3/SurveyRespondant.php           |  1 -
 api/v3/System.php                     |  1 -
 api/v3/Tag.php                        |  3 +--
 api/v3/UFField.php                    |  3 +--
 api/v3/UFGroup.php                    |  1 -
 api/v3/UFJoin.php                     |  5 ++---
 api/v3/UFMatch.php                    |  1 -
 api/v3/Website.php                    |  1 -
 api/v3/examples/ContactCreate.php     | 12 +++++-------
 api/v3/examples/CustomFieldCreate.php |  7 +++----
 api/v3/examples/GroupContact.php      |  1 -
 70 files changed, 104 insertions(+), 120 deletions(-)

diff --git a/api/class.api.php b/api/class.api.php
index 298427286b..f848ec9cf7 100644
--- a/api/class.api.php
+++ b/api/class.api.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /**
 
diff --git a/api/v2/Case.php b/api/v2/Case.php
index ed7ee7e7be..8836376a3f 100644
--- a/api/v2/Case.php
+++ b/api/v2/Case.php
@@ -238,10 +238,10 @@ function civicrm_case_get(&$params) {
     }
 
     $sql = "
-SELECT DISTINCT case_id 
-  FROM civicrm_relationship 
- WHERE (contact_id_a = $contact 
-    OR contact_id_b = $contact) 
+SELECT DISTINCT case_id
+  FROM civicrm_relationship
+ WHERE (contact_id_a = $contact
+    OR contact_id_b = $contact)
    AND case_id IS NOT NULL";
     $dao = CRM_Core_DAO::executeQuery($sql);
 
@@ -470,7 +470,7 @@ function _civicrm_case_format_params(&$params, $mode) {
       if (!$params['case_type_id']) {
         $sql = "
 SELECT  ov.value
-  FROM  civicrm_option_value ov 
+  FROM  civicrm_option_value ov
   JOIN  civicrm_option_group og ON og.id = ov.option_group_id
  WHERE  ov.label = %1 AND og.name = 'case_type'";
 
diff --git a/api/v2/Contact.php b/api/v2/Contact.php
index 33a8616c29..44aa1adedb 100644
--- a/api/v2/Contact.php
+++ b/api/v2/Contact.php
@@ -472,7 +472,7 @@ function _civicrm_contact_get_deprecated(&$params) {
 /**
  * Delete a contact with given contact id
  *
- * @param  array   	  $params (reference ) input parameters, contact_id element required
+ * @param  array       $params (reference ) input parameters, contact_id element required
  *
  * @return boolean        true if success, else false
  * @static void
diff --git a/api/v3/ActivityType.php b/api/v3/ActivityType.php
index d8b9490639..cc92b29102 100644
--- a/api/v3/ActivityType.php
+++ b/api/v3/ActivityType.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
@@ -90,7 +89,7 @@ function civicrm_api3_activity_type_create($params) {
 
 /**
  * Adjust Metadata for Create action
- * 
+ *
  * The metadata is used for setting defaults, documentation & validation
  * @param array $params array or parameters determined by getfields
  */
diff --git a/api/v3/Address.php b/api/v3/Address.php
index cfb839c7be..1f4c3a7106 100644
--- a/api/v3/Address.php
+++ b/api/v3/Address.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
diff --git a/api/v3/Batch.php b/api/v3/Batch.php
index 1fc7f84d29..64a03901b3 100644
--- a/api/v3/Batch.php
+++ b/api/v3/Batch.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
diff --git a/api/v3/Campaign.php b/api/v3/Campaign.php
index 6f047a1a23..d9b4e22b16 100644
--- a/api/v3/Campaign.php
+++ b/api/v3/Campaign.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
@@ -55,7 +54,7 @@ function civicrm_api3_campaign_create($params) {
 
 /**
  * Adjust Metadata for Create action
- * 
+ *
  * The metadata is used for setting defaults, documentation & validation
  * @param array $params array or parameters determined by getfields
  */
diff --git a/api/v3/Case.php b/api/v3/Case.php
index 5f6d4d0deb..856b335a4e 100644
--- a/api/v3/Case.php
+++ b/api/v3/Case.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
   +--------------------------------------------------------------------+
diff --git a/api/v3/Constant.php b/api/v3/Constant.php
index 51af6e2ff7..b7987c3b8a 100644
--- a/api/v3/Constant.php
+++ b/api/v3/Constant.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
diff --git a/api/v3/ContactType.php b/api/v3/ContactType.php
index f70b4116f3..aa1a6db4be 100644
--- a/api/v3/ContactType.php
+++ b/api/v3/ContactType.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
diff --git a/api/v3/Contribution.php b/api/v3/Contribution.php
index 6c3387b34c..391463f4c0 100644
--- a/api/v3/Contribution.php
+++ b/api/v3/Contribution.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
diff --git a/api/v3/ContributionRecur.php b/api/v3/ContributionRecur.php
index 31cfc4198f..3132042482 100644
--- a/api/v3/ContributionRecur.php
+++ b/api/v3/ContributionRecur.php
@@ -50,7 +50,7 @@ function civicrm_api3_contribution_recur_create($params) {
 
 /**
  * Adjust Metadata for Create action
- * 
+ *
  * The metadata is used for setting defaults, documentation & validation
  * @param array $params array or parameters determined by getfields
  */
diff --git a/api/v3/CustomField.php b/api/v3/CustomField.php
index 0b65242c57..149075df6d 100644
--- a/api/v3/CustomField.php
+++ b/api/v3/CustomField.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
@@ -93,7 +92,7 @@ function civicrm_api3_custom_field_create($params) {
 
 /**
  * Adjust Metadata for Create action
- * 
+ *
  * @param array $params array or parameters determined by getfields
  */
 function _civicrm_api3_custom_field_create_spec(&$params) {
@@ -134,11 +133,11 @@ function civicrm_api3_custom_field_get($params) {
 }
 
 /*
- * Helper function to validate custom field values 
- * 
+ * Helper function to validate custom field values
+ *
  * @params Array   $params             Custom fields with values
- * @params Array   $errors             Reference fields to be check with 
- * @params Boolean $checkForDisallowed Check for disallowed elements 
+ * @params Array   $errors             Reference fields to be check with
+ * @params Boolean $checkForDisallowed Check for disallowed elements
  *                                     in params
  * @params Boolean $checkForRequired   Check for non present required elements
  *                                     in params
@@ -147,7 +146,7 @@ function civicrm_api3_custom_field_get($params) {
 
 /**
  * Helper function to validate custom field value
- * 
+ *
  * @params String $fieldName    Custom field name (eg: custom_8 )
  * @params Mixed  $value        Field value to be validate
  * @params Array  $fieldDetails Field Details
@@ -233,7 +232,7 @@ function _civicrm_api3_custom_field_validate_field($fieldName, $value, $fieldDet
       }
 
       $query = "
-SELECT count(*) 
+SELECT count(*)
   FROM civicrm_state_province
  WHERE id IN ('" . implode("','", $value) . "')";
       if (CRM_Core_DAO::singleValueQuery($query) < count($value)) {
diff --git a/api/v3/CustomGroup.php b/api/v3/CustomGroup.php
index 37d17fab47..e5c06c3d00 100644
--- a/api/v3/CustomGroup.php
+++ b/api/v3/CustomGroup.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
diff --git a/api/v3/CustomValue.php b/api/v3/CustomValue.php
index 90724a6910..92bd6ee857 100644
--- a/api/v3/CustomValue.php
+++ b/api/v3/CustomValue.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
diff --git a/api/v3/Domain.php b/api/v3/Domain.php
index 0af1ed486b..1650d8fc91 100644
--- a/api/v3/Domain.php
+++ b/api/v3/Domain.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
diff --git a/api/v3/Email.php b/api/v3/Email.php
index c6b688de35..822548e9db 100644
--- a/api/v3/Email.php
+++ b/api/v3/Email.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
@@ -54,7 +53,7 @@ function civicrm_api3_email_create($params) {
 
 /**
  * Adjust Metadata for Create action
- * 
+ *
  * The metadata is used for setting defaults, documentation & validation
  * @param array $params array or parameters determined by getfields
  */
diff --git a/api/v3/Entity.php b/api/v3/Entity.php
index 9a2a935c35..d727fc5875 100644
--- a/api/v3/Entity.php
+++ b/api/v3/Entity.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 require_once 'api/v3/utils.php';
 
diff --git a/api/v3/EntityTag.php b/api/v3/EntityTag.php
index 62409dcb47..ed36e5a6b7 100644
--- a/api/v3/EntityTag.php
+++ b/api/v3/EntityTag.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
diff --git a/api/v3/Event.php b/api/v3/Event.php
index 569456efe1..8158765f26 100644
--- a/api/v3/Event.php
+++ b/api/v3/Event.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
diff --git a/api/v3/Extension.php b/api/v3/Extension.php
index 3bcd9948c5..8d5a2e457a 100644
--- a/api/v3/Extension.php
+++ b/api/v3/Extension.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 define('API_V3_EXTENSION_DELIMITER', ',');
 
diff --git a/api/v3/File.php b/api/v3/File.php
index aec82c9bba..bb2d3c0664 100644
--- a/api/v3/File.php
+++ b/api/v3/File.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
diff --git a/api/v3/Generic.php b/api/v3/Generic.php
index 71eaf93af6..250a353b04 100644
--- a/api/v3/Generic.php
+++ b/api/v3/Generic.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /**
  * Get information about fields for a given api request. Getfields information
diff --git a/api/v3/Generic/Getactions.php b/api/v3/Generic/Getactions.php
index e7743ae6bc..50c9548afe 100644
--- a/api/v3/Generic/Getactions.php
+++ b/api/v3/Generic/Getactions.php
@@ -1,5 +1,30 @@
 <?php
-// $Id$
+
+/*
+ +--------------------------------------------------------------------+
+| CiviCRM version 4.3                                                |
++--------------------------------------------------------------------+
+| Copyright CiviCRM LLC (c) 2004-2013                                |
++--------------------------------------------------------------------+
+| This file is a part of CiviCRM.                                    |
+|                                                                    |
+| CiviCRM is free software; you can copy, modify, and distribute it  |
+| under the terms of the GNU Affero General Public License           |
+| Version 3, 19 November 2007 and the CiviCRM Licensing Exception.   |
+|                                                                    |
+| CiviCRM is distributed in the hope that it will be useful, but     |
+| WITHOUT ANY WARRANTY; without even the implied warranty of         |
+| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.               |
+| See the GNU Affero General Public License for more details.        |
+|                                                                    |
+| You should have received a copy of the GNU Affero General Public   |
+| License and the CiviCRM Licensing Exception along                  |
+| with this program; if not, contact CiviCRM LLC                     |
+| at info[AT]civicrm[DOT]org. If you have questions about the        |
+| GNU Affero General Public License or the licensing of CiviCRM,     |
+| see the CiviCRM license FAQ at http://civicrm.org/licensing        |
++--------------------------------------------------------------------+
+*/
 
 function civicrm_api3_generic_getActions($params) {
   civicrm_api3_verify_mandatory($params, NULL, array('entity'));
diff --git a/api/v3/Generic/Update.php b/api/v3/Generic/Update.php
index 6de91c7464..ec453fb283 100644
--- a/api/v3/Generic/Update.php
+++ b/api/v3/Generic/Update.php
@@ -1,5 +1,30 @@
 <?php
-// $Id$
+
+/*
+ +--------------------------------------------------------------------+
+ | CiviCRM version 4.3                                                |
+ +--------------------------------------------------------------------+
+ | Copyright CiviCRM LLC (c) 2004-2013                                |
+ +--------------------------------------------------------------------+
+ | This file is a part of CiviCRM.                                    |
+ |                                                                    |
+ | CiviCRM is free software; you can copy, modify, and distribute it  |
+ | under the terms of the GNU Affero General Public License           |
+ | Version 3, 19 November 2007 and the CiviCRM Licensing Exception.   |
+ |                                                                    |
+ | CiviCRM is distributed in the hope that it will be useful, but     |
+ | WITHOUT ANY WARRANTY; without even the implied warranty of         |
+ | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.               |
+ | See the GNU Affero General Public License for more details.        |
+ |                                                                    |
+ | You should have received a copy of the GNU Affero General Public   |
+ | License and the CiviCRM Licensing Exception along                  |
+ | with this program; if not, contact CiviCRM LLC                     |
+ | at info[AT]civicrm[DOT]org. If you have questions about the        |
+ | GNU Affero General Public License or the licensing of CiviCRM,     |
+ | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
+ +--------------------------------------------------------------------+
+*/
 
 /**
  * Update function is basically a hack to get around issues listed in
diff --git a/api/v3/Grant.php b/api/v3/Grant.php
index 348e73b1e8..6eeec64001 100644
--- a/api/v3/Grant.php
+++ b/api/v3/Grant.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
diff --git a/api/v3/Group.php b/api/v3/Group.php
index c37fe2f1fd..440f040604 100644
--- a/api/v3/Group.php
+++ b/api/v3/Group.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
diff --git a/api/v3/GroupNesting.php b/api/v3/GroupNesting.php
index 2db1fa8c7d..3aca06e1ec 100644
--- a/api/v3/GroupNesting.php
+++ b/api/v3/GroupNesting.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
@@ -72,7 +71,7 @@ function civicrm_api3_group_nesting_create($params) {
 
 /**
  * Adjust Metadata for Create action
- * 
+ *
  * The metadata is used for setting defaults, documentation & validation
  * @param array $params array or parameters determined by getfields
  */
diff --git a/api/v3/GroupOrganization.php b/api/v3/GroupOrganization.php
index efb9483765..9aa2e1bfe3 100644
--- a/api/v3/GroupOrganization.php
+++ b/api/v3/GroupOrganization.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
@@ -78,7 +77,7 @@ function civicrm_api3_group_organization_create($params) {
 
 /**
  * Adjust Metadata for Create action
- * 
+ *
  * The metadata is used for setting defaults, documentation & validation
  * @param array $params array or parameters determined by getfields
  */
diff --git a/api/v3/Location.php b/api/v3/Location.php
index 345f9c0e3c..739eaa3b89 100644
--- a/api/v3/Location.php
+++ b/api/v3/Location.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 require_once 'api/v3/utils.php';
 
diff --git a/api/v3/LocationType.php b/api/v3/LocationType.php
index 83ad6a58de..ddf9a120c5 100644
--- a/api/v3/LocationType.php
+++ b/api/v3/LocationType.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
diff --git a/api/v3/MailSettings.php b/api/v3/MailSettings.php
index 0f34bf6a51..be234b7874 100644
--- a/api/v3/MailSettings.php
+++ b/api/v3/MailSettings.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
diff --git a/api/v3/Mailing.php b/api/v3/Mailing.php
index 44a6f6a579..5f8ec91cc8 100644
--- a/api/v3/Mailing.php
+++ b/api/v3/Mailing.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
diff --git a/api/v3/MailingEventConfirm.php b/api/v3/MailingEventConfirm.php
index 04b20b47e2..e59f5b7474 100644
--- a/api/v3/MailingEventConfirm.php
+++ b/api/v3/MailingEventConfirm.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
@@ -64,7 +63,7 @@ function civicrm_api3_mailing_event_confirm_create($params) {
 
 /**
  * Adjust Metadata for Create action
- * 
+ *
  * The metadata is used for setting defaults, documentation & validation
  * @param array $params array or parameters determined by getfields
  */
diff --git a/api/v3/MailingEventResubscribe.php b/api/v3/MailingEventResubscribe.php
index 4dcac85bec..f6ee1bf907 100644
--- a/api/v3/MailingEventResubscribe.php
+++ b/api/v3/MailingEventResubscribe.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
@@ -69,7 +68,7 @@ function civicrm_api3_mailing_event_resubscribe_create($params) {
 
 /**
  * Adjust Metadata for Create action
- * 
+ *
  * The metadata is used for setting defaults, documentation & validation
  * @param array $params array or parameters determined by getfields
  */
diff --git a/api/v3/MailingEventSubscribe.php b/api/v3/MailingEventSubscribe.php
index 3730d90bdb..9ec4744c39 100644
--- a/api/v3/MailingEventSubscribe.php
+++ b/api/v3/MailingEventSubscribe.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
@@ -81,7 +80,7 @@ function civicrm_api3_mailing_event_subscribe_create($params) {
 
 /**
  * Adjust Metadata for Create action
- * 
+ *
  * The metadata is used for setting defaults, documentation & validation
  * @param array $params array or parameters determined by getfields
  */
diff --git a/api/v3/MailingEventUnsubscribe.php b/api/v3/MailingEventUnsubscribe.php
index 485651985a..efdee308cc 100644
--- a/api/v3/MailingEventUnsubscribe.php
+++ b/api/v3/MailingEventUnsubscribe.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
@@ -77,7 +76,7 @@ function civicrm_api3_mailing_event_unsubscribe_create($params) {
 
 /**
  * Adjust Metadata for Create action
- * 
+ *
  * The metadata is used for setting defaults, documentation & validation
  * @param array $params array or parameters determined by getfields
  */
diff --git a/api/v3/MailingGroup.php b/api/v3/MailingGroup.php
index b9ac904baa..3f7a6ada83 100644
--- a/api/v3/MailingGroup.php
+++ b/api/v3/MailingGroup.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
diff --git a/api/v3/MailingJob.php b/api/v3/MailingJob.php
index 15b6afa5d0..9b76181952 100644
--- a/api/v3/MailingJob.php
+++ b/api/v3/MailingJob.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
diff --git a/api/v3/MailingRecipients.php b/api/v3/MailingRecipients.php
index 3f7213e3c6..f8568a2e7f 100644
--- a/api/v3/MailingRecipients.php
+++ b/api/v3/MailingRecipients.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
diff --git a/api/v3/Membership.php b/api/v3/Membership.php
index 5b337bd723..95345c1c91 100644
--- a/api/v3/Membership.php
+++ b/api/v3/Membership.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
diff --git a/api/v3/MembershipPayment.php b/api/v3/MembershipPayment.php
index f75e8a8cdf..b4332ac813 100644
--- a/api/v3/MembershipPayment.php
+++ b/api/v3/MembershipPayment.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
@@ -70,7 +69,7 @@ function civicrm_api3_membership_payment_create($params) {
 
 /**
  * Adjust Metadata for Create action
- * 
+ *
  * The metadata is used for setting defaults, documentation & validation
  * @param array $params array or parameters determined by getfields
  */
diff --git a/api/v3/MembershipStatus.php b/api/v3/MembershipStatus.php
index c974d59278..0d82d83da3 100644
--- a/api/v3/MembershipStatus.php
+++ b/api/v3/MembershipStatus.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
diff --git a/api/v3/MembershipType.php b/api/v3/MembershipType.php
index 30f9e5f103..b29899383e 100644
--- a/api/v3/MembershipType.php
+++ b/api/v3/MembershipType.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
@@ -65,7 +64,7 @@ function civicrm_api3_membership_type_create($params) {
 
 /**
  * Adjust Metadata for Create action
- * 
+ *
  * The metadata is used for setting defaults, documentation & validation
  * @param array $params array or parameters determined by getfields
  */
diff --git a/api/v3/Note.php b/api/v3/Note.php
index 18d3919881..9595264b03 100644
--- a/api/v3/Note.php
+++ b/api/v3/Note.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
@@ -77,7 +76,7 @@ function civicrm_api3_note_create($params) {
 
 /**
  * Adjust Metadata for Create action
- * 
+ *
  * The metadata is used for setting defaults, documentation & validation
  * @param array $params array or parameters determined by getfields
  */
@@ -123,7 +122,7 @@ function civicrm_api3_note_get($params) {
 
 /**
  * Adjust Metadata for Get action
- * 
+ *
  * The metadata is used for setting defaults, documentation & validation
  * @param array $params array or parameters determined by getfields
  */
diff --git a/api/v3/OptionGroup.php b/api/v3/OptionGroup.php
index 53d954da3a..8d0706d6ab 100644
--- a/api/v3/OptionGroup.php
+++ b/api/v3/OptionGroup.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 function civicrm_api3_option_group_get($params) {
 
@@ -37,7 +36,7 @@ function civicrm_api3_option_group_create($params) {
 
 /**
  * Adjust Metadata for Create action
- * 
+ *
  * The metadata is used for setting defaults, documentation & validation
  * @param array $params array or parameters determined by getfields
  */
diff --git a/api/v3/OptionValue.php b/api/v3/OptionValue.php
index de9c613949..772a0d5465 100644
--- a/api/v3/OptionValue.php
+++ b/api/v3/OptionValue.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /**
  * Retrieve one or more OptionValues
diff --git a/api/v3/Participant.php b/api/v3/Participant.php
index e3d1c74123..71c0980416 100644
--- a/api/v3/Participant.php
+++ b/api/v3/Participant.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
diff --git a/api/v3/ParticipantPayment.php b/api/v3/ParticipantPayment.php
index 3eae063292..f2d3dccfd7 100644
--- a/api/v3/ParticipantPayment.php
+++ b/api/v3/ParticipantPayment.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
@@ -72,7 +71,7 @@ function civicrm_api3_participant_payment_create($params) {
 
 /**
  * Adjust Metadata for Create action
- * 
+ *
  * The metadata is used for setting defaults, documentation & validation
  * @param array $params array or parameters determined by getfields
  */
diff --git a/api/v3/ParticipantStatusType.php b/api/v3/ParticipantStatusType.php
index 7c43d7cd8f..7ca0e1f9f2 100644
--- a/api/v3/ParticipantStatusType.php
+++ b/api/v3/ParticipantStatusType.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
diff --git a/api/v3/PaymentProcessorType.php b/api/v3/PaymentProcessorType.php
index d7b6ba1c77..eb8d57f4fa 100644
--- a/api/v3/PaymentProcessorType.php
+++ b/api/v3/PaymentProcessorType.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
diff --git a/api/v3/Phone.php b/api/v3/Phone.php
index 330de642bc..4bfbcb8f21 100644
--- a/api/v3/Phone.php
+++ b/api/v3/Phone.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
@@ -53,7 +52,7 @@ function civicrm_api3_phone_create($params) {
 
 /**
  * Adjust Metadata for Create action
- * 
+ *
  * The metadata is used for setting defaults, documentation & validation
  * @param array $params array or parameters determined by getfields
  */
diff --git a/api/v3/Phone/Get.php b/api/v3/Phone/Get.php
index de9c8ae259..4a9449ab75 100644
--- a/api/v3/Phone/Get.php
+++ b/api/v3/Phone/Get.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /**
  * Retrieve one or more phones
diff --git a/api/v3/Pledge.php b/api/v3/Pledge.php
index e77858a3f5..2e5caf44f3 100644
--- a/api/v3/Pledge.php
+++ b/api/v3/Pledge.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
@@ -73,15 +72,15 @@ function civicrm_api3_pledge_create($params) {
  * @example PledgeDelete.php
  * @access public
  */
-function civicrm_api3_pledge_delete($params) {
-  if (CRM_Pledge_BAO_Pledge::deletePledge($params['id'])) {
-    return civicrm_api3_create_success(array(
-      'id' => $params['id']
-    ), $params, 'pledge', 'delete');
-  }
-  else {
-    return civicrm_api3_create_error('Could not delete pledge');
-  }
+function civicrm_api3_pledge_delete($params) {
+  if (CRM_Pledge_BAO_Pledge::deletePledge($params['id'])) {
+    return civicrm_api3_create_success(array(
+      'id' => $params['id']
+    ), $params, 'pledge', 'delete');
+  }
+  else {
+    return civicrm_api3_create_error('Could not delete pledge');
+  }
 }
 
 function _civicrm_api3_pledge_delete_spec(&$params) {
diff --git a/api/v3/PledgePayment.php b/api/v3/PledgePayment.php
index e39c5c6d3d..994bbbbc5b 100644
--- a/api/v3/PledgePayment.php
+++ b/api/v3/PledgePayment.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
diff --git a/api/v3/Profile.php b/api/v3/Profile.php
index 30343ca949..48a7ddfefa 100644
--- a/api/v3/Profile.php
+++ b/api/v3/Profile.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
   +--------------------------------------------------------------------+
diff --git a/api/v3/Relationship.php b/api/v3/Relationship.php
index 82db724c63..ff5e5515a4 100644
--- a/api/v3/Relationship.php
+++ b/api/v3/Relationship.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
diff --git a/api/v3/RelationshipType.php b/api/v3/RelationshipType.php
index d0762420d0..a25ad6716e 100644
--- a/api/v3/RelationshipType.php
+++ b/api/v3/RelationshipType.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
@@ -80,7 +79,7 @@ function civicrm_api3_relationship_type_create($params) {
 
 /**
  * Adjust Metadata for Create action
- * 
+ *
  * The metadata is used for setting defaults, documentation & validation
  * @param array $params array or parameters determined by getfields
  */
diff --git a/api/v3/Survey.php b/api/v3/Survey.php
index 684359d69b..aff79bdc50 100644
--- a/api/v3/Survey.php
+++ b/api/v3/Survey.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
diff --git a/api/v3/SurveyRespondant.php b/api/v3/SurveyRespondant.php
index 851fd98754..b1d09bd3ab 100644
--- a/api/v3/SurveyRespondant.php
+++ b/api/v3/SurveyRespondant.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
diff --git a/api/v3/System.php b/api/v3/System.php
index 80231f8219..0373e46ea6 100644
--- a/api/v3/System.php
+++ b/api/v3/System.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
diff --git a/api/v3/Tag.php b/api/v3/Tag.php
index 02db94b3a8..2d4e01da67 100644
--- a/api/v3/Tag.php
+++ b/api/v3/Tag.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
@@ -65,7 +64,7 @@ function civicrm_api3_tag_create($params) {
   }
 
 /**
- * Specify Meta data for create. Note that this data is retrievable via the getfields function 
+ * Specify Meta data for create. Note that this data is retrievable via the getfields function
  * and is used for pre-filling defaults and ensuring mandatory requirements are met.
  */
 function _civicrm_api3_tag_create_spec(&$params) {
diff --git a/api/v3/UFField.php b/api/v3/UFField.php
index 030bd99c13..5c2293b542 100644
--- a/api/v3/UFField.php
+++ b/api/v3/UFField.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
@@ -161,7 +160,7 @@ function civicrm_api3_uf_field_delete($params) {
 
   return civicrm_api3_create_success($result, $params);
 }
-/* 
+/*
  * field id accepted for backward compat - unset required on id
  */
 function _civicrm_api3_uf_field_delete_spec(&$params) {
diff --git a/api/v3/UFGroup.php b/api/v3/UFGroup.php
index 80c69a131a..0c77c402d1 100644
--- a/api/v3/UFGroup.php
+++ b/api/v3/UFGroup.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
diff --git a/api/v3/UFJoin.php b/api/v3/UFJoin.php
index 5b0a6ec3c1..4f3377d7f0 100644
--- a/api/v3/UFJoin.php
+++ b/api/v3/UFJoin.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
@@ -58,9 +57,9 @@ function civicrm_api3_uf_join_create($params) {
 
 /**
  * Adjust Metadata for Create action
- * 
+ *
  * @param array $params array or parameters determined by getfields
- * @todo - suspect module, weight don't need to be required - need to test 
+ * @todo - suspect module, weight don't need to be required - need to test
  */
 function _civicrm_api3_uf_join_create_spec(&$params) {
   $params['module']['api.required'] = 1;
diff --git a/api/v3/UFMatch.php b/api/v3/UFMatch.php
index 388a562a4f..5a30616bbf 100644
--- a/api/v3/UFMatch.php
+++ b/api/v3/UFMatch.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
diff --git a/api/v3/Website.php b/api/v3/Website.php
index 2c07014857..35ee7835a4 100644
--- a/api/v3/Website.php
+++ b/api/v3/Website.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
diff --git a/api/v3/examples/ContactCreate.php b/api/v3/examples/ContactCreate.php
index ba5474a75d..44c0afe0d7 100644
--- a/api/v3/examples/ContactCreate.php
+++ b/api/v3/examples/ContactCreate.php
@@ -1,10 +1,8 @@
 <?php
-// $Id$
-
 
 
 /*
- 
+
  */
 function contact_create_example() {
   $params = array(
@@ -179,11 +177,11 @@ function contact_create_expectedresult() {
 
 /*
 * This example has been generated from the API test suite. The test that created it is called
-* 
-* testCreateIndividualWithContributionChainedArrays and can be found in 
+*
+* testCreateIndividualWithContributionChainedArrays and can be found in
 * http://svn.civicrm.org/civicrm/branches/v3.4/tests/phpunit/CiviTest/api/v3/ContactTest.php
-* 
-* You can see the outcome of the API tests at 
+*
+* You can see the outcome of the API tests at
 * http://tests.dev.civicrm.org/trunk/results-api_v3
 * and review the wiki at
 * http://wiki.civicrm.org/confluence/display/CRMDOC/CiviCRM+Public+APIs
diff --git a/api/v3/examples/CustomFieldCreate.php b/api/v3/examples/CustomFieldCreate.php
index b5634aed8e..fa6d263de2 100644
--- a/api/v3/examples/CustomFieldCreate.php
+++ b/api/v3/examples/CustomFieldCreate.php
@@ -1,10 +1,9 @@
 <?php
-// $Id$
 
 
 
 /*
- 
+
  */
 function custom_field_create_example() {
   $params = array(
@@ -79,8 +78,8 @@ function custom_field_create_expectedresult() {
 
 /*
 * This example has been generated from the API test suite. The test that created it is called
-* custom_field_create 
-* You can see the outcome of the API tests at 
+* custom_field_create
+* You can see the outcome of the API tests at
 * http://tests.dev.civicrm.org/trunk/results-api_v3
 * and review the wiki at
 * http://wiki.civicrm.org/confluence/display/CRMDOC40/CiviCRM+Public+APIs
diff --git a/api/v3/examples/GroupContact.php b/api/v3/examples/GroupContact.php
index 34045b536f..944e989a4f 100644
--- a/api/v3/examples/GroupContact.php
+++ b/api/v3/examples/GroupContact.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 function group_contact__example() {
   $params = array(
-- 
GitLab