From 9a6cd1bd3fdd78eb6f9257784eba2bf79c4daa4d Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Thu, 18 May 2017 12:54:33 -0700
Subject: [PATCH 01/86] CRM-20541 - Use drupal_static() instead of static

The impetus behind CRM-20541 seems to be a testing scenario where the
setup/teardown process resets Civi (`Civi::reset()`) without resetting
Drupal (`drupal_static_reset()`).  IMHO, it's better to keep the systems
aligned by either (a) resetting both or (b) resetting neither.

For the situation where you reset both, the state within
`civicrm_initialize()` needs some way to reset.  This function executes
within a Drupal context (before Civi has booted), so it should obey the
reset conventions for Drupal -- i.e.  use `drupal_static()`.
---
 civicrm.module | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/civicrm.module b/civicrm.module
index 82f1af5..1d52b31 100644
--- a/civicrm.module
+++ b/civicrm.module
@@ -156,8 +156,8 @@ function civicrm_initialize() {
   }
   _civicrm_registerClassLoader();
 
-  static $initialized = FALSE;
-  static $failure = FALSE;
+  $initialized = &drupal_static('civicrm_initialize', FALSE);
+  $failure = &drupal_static('civicrm_initialize_failure', FALSE);
 
   if ($failure) {
     return FALSE;
@@ -687,7 +687,7 @@ function civicrm_user_form_validate($form, &$form_state) {
   // lets suppress key generation for all validation also
   civicrm_key_disable();
 
-  static $validated = FALSE;
+  $validated = &drupal_static(__FUNCTION__, FALSE);
 
   if ($validated) {
     return;

From 6e13de48f4042851b1673add88cf221a6a9421bd Mon Sep 17 00:00:00 2001
From: Klaas Eikelboom <klaas@kainuk.nl>
Date: Sun, 25 Jun 2017 13:40:56 -0400
Subject: [PATCH 02/86] CRM-19976: Fix for Drush: cannot disable civicrm debug

---
 drush/civicrm.drush.inc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drush/civicrm.drush.inc b/drush/civicrm.drush.inc
index c9a73ca..5649303 100644
--- a/drush/civicrm.drush.inc
+++ b/drush/civicrm.drush.inc
@@ -155,6 +155,9 @@ function civicrm_drush_command() {
   $items['civicrm-enable-debug'] = array(
     'description' => "Enable CiviCRM Debugging.",
   );
+  $items['civicrm-disable-debug'] = array(
+    'description' => "Disable CiviCRM Debugging.",
+  );
   $items['civicrm-upgrade'] = array(
     'description' => "Replace CiviCRM codebase with new specified tarfile and upgrade database by executing the CiviCRM upgrade process - civicrm/upgrade?reset=1.",
     'examples' =>

From 36165b7326ff936fbf41e9c024b4140316afc86a Mon Sep 17 00:00:00 2001
From: yashodha <yashodha@cividesk.com>
Date: Thu, 6 Jul 2017 12:17:07 +0530
Subject: [PATCH 03/86] CRM-20822 - Expose tag parent id in views

---
 modules/views/components/civicrm.core.inc | 24 +++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/modules/views/components/civicrm.core.inc b/modules/views/components/civicrm.core.inc
index 30691de..3f60277 100644
--- a/modules/views/components/civicrm.core.inc
+++ b/modules/views/components/civicrm.core.inc
@@ -2967,6 +2967,30 @@ function _civicrm_core_data(&$data, $enabled) {
     'sort' => array(
       'handler' => 'views_handler_sort',
     ),
+    'filter' => array(
+      'handler' => 'views_handler_filter_string',
+      'allow empty' => TRUE,
+    ),
+  );
+
+  $data['civicrm_tag']['parent_id'] = array(
+    'title' => t('Tag Parent ID'),
+    'help' => t('The numeric ID of the parent tag'),
+    'field' => array(
+      'handler' => 'views_handler_field_numeric',
+      'click sortable' => TRUE,
+    ),
+    'argument' => array(
+      'handler' => 'views_handler_argument_numeric',
+      'numeric' => TRUE,
+    ),
+    'filter' => array(
+      'handler' => 'views_handler_filter_numeric',
+      'allow empty' => TRUE,
+    ),
+    'sort' => array(
+      'handler' => 'views_handler_sort',
+    ),
   );
 
   /*

From 9b18bdd1122df09d6259c64205e67f44d98da2f8 Mon Sep 17 00:00:00 2001
From: yashodha <yashodha@cividesk.com>
Date: Thu, 6 Jul 2017 12:24:10 +0530
Subject: [PATCH 04/86] CRM-20822 - Expose tag parent name in views

---
 modules/views/components/civicrm.core.inc | 25 +++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/modules/views/components/civicrm.core.inc b/modules/views/components/civicrm.core.inc
index 3f60277..2abf069 100644
--- a/modules/views/components/civicrm.core.inc
+++ b/modules/views/components/civicrm.core.inc
@@ -2993,6 +2993,31 @@ function _civicrm_core_data(&$data, $enabled) {
     ),
   );
 
+   $data['civicrm_tag']['parent_name'] = array(
+    'title' => t('Parent Name'),
+    'help' => t('Name of Parent Tag'),
+    'real field' => 'parent_id',
+    'field' => array(
+      'handler' => 'civicrm_handler_field_pseudo_constant',
+      'click sortable' => TRUE,
+      'pseudo class' => 'CRM_Core_PseudoConstant',
+      'pseudo method' => 'get',
+      'pseudo args' => array('CRM_Core_BAO_EntityTag', 'tag_id'),
+    ),
+    'argument' => array(
+      'handler' => 'views_handler_argument',
+    ),
+    'filter' => array(
+      'handler' => 'civicrm_handler_filter_pseudo_constant',
+      'pseudo class' => 'CRM_Core_PseudoConstant',
+      'pseudo method' => 'get',
+      'pseudo args' => array('CRM_Core_BAO_EntityTag', 'tag_id'),
+    ),
+    'sort' => array(
+      'handler' => 'views_handler_sort',
+    ),
+  );
+
   /*
     * UF Match table - expose drupal ID
     */

From 9e532d559caa3daa0d4032acb7b0faba291f4132 Mon Sep 17 00:00:00 2001
From: Deepak Srivastava <deepak.srivastava.0303@gmail.com>
Date: Thu, 13 Jul 2017 16:23:53 +0100
Subject: [PATCH 05/86] CRM-20153 show event pages for pcp

---
 .../views/components/civicrm.contribute.inc   | 30 ++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/modules/views/components/civicrm.contribute.inc b/modules/views/components/civicrm.contribute.inc
index e1ecf39..27e498f 100644
--- a/modules/views/components/civicrm.contribute.inc
+++ b/modules/views/components/civicrm.contribute.inc
@@ -1347,7 +1347,7 @@ function _civicrm_contribute_data(&$data, $enabled) {
 
   // contribution page
   $data['civicrm_pcp']['contribution_page'] = array(
-    'title' => t('Associated Contribution or Event Page'),
+    'title' => t('Associated Contribution Page'),
     'real field' => 'page_id',
     'help' => t('The Contribution or Event Page with which this Personal Campaign Page is associated.'),
     'field' => array(
@@ -1371,6 +1371,34 @@ function _civicrm_contribute_data(&$data, $enabled) {
     ),
   );
 
+  // event page
+  $data['civicrm_pcp']['event_page'] = array(
+    'title' => t('Associated Event Page'),
+    'real field' => 'page_id',
+    'help' => t('The Event or Event Page with which this Personal Campaign Page is associated.'),
+    'field' => array(
+      'handler' => 'civicrm_handler_field_pseudo_constant',
+      'click sortable' => TRUE,
+      'pseudo class' => 'CRM_Event_PseudoConstant',
+      'pseudo method' => 'event',
+      'pseudo args' => array(NULL, FALSE, 'is_template = 0'),
+    ),
+    'argument' => array(
+      'handler' => 'views_handler_argument',
+      'numeric' => TRUE,
+    ),
+    'filter' => array(
+      'handler' => 'civicrm_handler_filter_pseudo_constant',
+      'allow empty' => TRUE,
+      'pseudo class' => 'CRM_Event_PseudoConstant',
+      'pseudo method' => 'event',
+      'pseudo args' => array(NULL, FALSE, 'is_template = 0'),
+    ),
+    'sort' => array(
+      'handler' => 'views_handler_sort',
+    ),
+  );
+
   //BOOLEAN : IS Thermometer
   $data['civicrm_pcp']['is_thermometer'] = array(
     'title' => t('Is Thermometer'),

From cbeb2aca4391656becd44291f0d689c0defe5a8a Mon Sep 17 00:00:00 2001
From: Jamie McClelland <jm@mayfirst.org>
Date: Fri, 21 Jul 2017 12:42:36 -0400
Subject: [PATCH 06/86] CRM-20937 - update to most recent templates used in
 core.

---
 .../CRM/Contact/Form/Edit/Demographics.tpl    | 21 ++++++++++---------
 .../CRM/Contact/Form/Inline/Demographics.tpl  |  9 ++++----
 .../CRM/Contact/Page/Inline/Demographics.tpl  | 20 +++++++-----------
 3 files changed, 22 insertions(+), 28 deletions(-)

diff --git a/modules/civicrm_engage/templates/CRM/Contact/Form/Edit/Demographics.tpl b/modules/civicrm_engage/templates/CRM/Contact/Form/Edit/Demographics.tpl
index ab14a0d..d8f5898 100644
--- a/modules/civicrm_engage/templates/CRM/Contact/Form/Edit/Demographics.tpl
+++ b/modules/civicrm_engage/templates/CRM/Contact/Form/Edit/Demographics.tpl
@@ -25,27 +25,27 @@
 *}
 <div class="crm-accordion-wrapper crm-demographics-accordion collapsed">
  <div class="crm-accordion-header">
-  {$title}
+    {$title}
   </div><!-- /.crm-accordion-header -->
   <div id="demographics" class="crm-accordion-body">
   <div class="form-item">
-        <span class="labels">{$form.gender_id.label}</span>
+        <span class="label">{$form.gender_id.label}</span>
 
-  <span class="fields">
+  <span class="value">
         {$form.gender_id.html}
         </span>
   </div>
   <div class="form-item">
-        <span class="labels">{$form.birth_date.label}</span>
-        <span class="fields">{include file="CRM/common/jcalendar.tpl" elementName=birth_date}</span>
+        <span class="label">{$form.birth_date.label}</span>
+        <span class="fields">{$form.birth_date.html}</span>
   </div>
   <div class="form-item">
        {$form.is_deceased.html}
        {$form.is_deceased.label}
   </div>
   <div id="showDeceasedDate" class="form-item">
-       <span class="labels">{$form.deceased_date.label}</span>
-       <span class="fields">{include file="CRM/common/jcalendar.tpl" elementName=deceased_date}</span>
+       <span class="label">{$form.deceased_date.label}</span>
+       <span class="fields">{$form.deceased_date.html}</span>
   </div>
   {if isset($demographics_groupTree)}{foreach from=$demographics_groupTree item=cd_edit key=group_id}
      {foreach from=$cd_edit.fields item=element key=field_id}
@@ -62,10 +62,11 @@
     showDeceasedDate( );
     function showDeceasedDate( )
     {
-        if (document.getElementsByName("is_deceased")[0].checked) {
-          cj('#showDeceasedDate').show();
+        if ( cj("#is_deceased").is(':checked') ) {
+            cj("#showDeceasedDate").show( );
         } else {
-          cj('#showDeceasedDate').hide();
+    cj("#showDeceasedDate").hide( );
+         cj("#deceased_date").val('');
         }
     }
 </script>
diff --git a/modules/civicrm_engage/templates/CRM/Contact/Form/Inline/Demographics.tpl b/modules/civicrm_engage/templates/CRM/Contact/Form/Inline/Demographics.tpl
index cc3110a..33a2a1b 100644
--- a/modules/civicrm_engage/templates/CRM/Contact/Form/Inline/Demographics.tpl
+++ b/modules/civicrm_engage/templates/CRM/Contact/Form/Inline/Demographics.tpl
@@ -32,13 +32,12 @@
   <div class="crm-clear">
     <div class="crm-summary-row">
       <div class="crm-label">{$form.gender_id.label}</div>
-      <div class="crm-content">{$form.gender_id.html}
-      </div>
+      <div class="crm-content">{$form.gender_id.html}</div>
     </div>
     <div class="crm-summary-row">
       <div class="crm-label">{$form.birth_date.label}</div>
       <div class="crm-content">
-        {include file="CRM/common/jcalendar.tpl" elementName=birth_date}
+        {$form.birth_date.html}
       </div>
     </div>
     <div class="crm-summary-row">
@@ -51,7 +50,7 @@
     <div class="crm-summary-row">
       <div class="crm-label crm-deceased-date">{$form.deceased_date.label}</div>
       <div class="crm-content crm-deceased-date">
-        {include file="CRM/common/jcalendar.tpl" elementName=deceased_date}
+        {$form.deceased_date.html}
       </div>
     </div>
 
@@ -81,7 +80,7 @@ function showDeceasedDate( ) {
   }
 }
 
-cj( function() {
+CRM.$(function($) {
   showDeceasedDate( );
 });
 </script>
diff --git a/modules/civicrm_engage/templates/CRM/Contact/Page/Inline/Demographics.tpl b/modules/civicrm_engage/templates/CRM/Contact/Page/Inline/Demographics.tpl
index e631cd4..11477bc 100644
--- a/modules/civicrm_engage/templates/CRM/Contact/Page/Inline/Demographics.tpl
+++ b/modules/civicrm_engage/templates/CRM/Contact/Page/Inline/Demographics.tpl
@@ -23,8 +23,8 @@
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
 *}
-<div id="crm-demographic-content" {if $permission EQ 'edit'} class="crm-inline-edit" data-edit-params='{ldelim}"cid": "{$contactId}", "class_name": "CRM_Contact_Form_Inline_Demographics"{rdelim}'{/if}>
-  <div class="crm-clear" {if $permission EQ 'edit'}title="{ts}Edit demographics{/ts}"{/if}>
+<div id="crm-demographic-content" {if $permission EQ 'edit'} class="crm-inline-edit" data-dependent-fields='["#crm-contactname-content"]' data-edit-params='{ldelim}"cid": "{$contactId}", "class_name": "CRM_Contact_Form_Inline_Demographics"{rdelim}'{/if}>
+  <div class="crm-clear crm-inline-block-content" {if $permission EQ 'edit'}title="{ts}Edit demographics{/ts}"{/if}>
     {if $permission EQ 'edit'}
     <div class="crm-edit-help">
       <span class="crm-i fa-pencil"></span> {ts}Edit demographics{/ts}
@@ -34,14 +34,12 @@
       <div class="crm-label">{ts}Gender{/ts}</div>
       <div class="crm-content crm-contact-gender_display">{$gender_display}</div>
     </div>
+
     <div class="crm-summary-row">
-      <div class="crm-label">{ts}Date of birth{/ts}</div>
+      <div class="crm-label">{ts}Date of Birth{/ts}</div>
       <div class="crm-content crm-contact-birth_date_display">
-          {if $birthDateViewFormat}
-            {$birth_date_display|crmDate:$birthDateViewFormat}
-          {else}
-            {$birth_date_display|crmDate}
-          {/if}
+         {assign var="date_format" value = $fields.birth_date.smarty_view_format}
+         {$birth_date|crmDate:$date_format}
           &nbsp;
       </div>
     </div>
@@ -50,11 +48,7 @@
           <div class="crm-summary-row">
             <div class="crm-label">{ts}Date Deceased{/ts}</div>
             <div class="crm-content crm-contact-deceased_date_display">
-            {if $birthDateViewFormat}
-              {$deceased_date_display|crmDate:$birthDateViewFormat}
-            {else}
-              {$deceased_date_display|crmDate}
-             {/if}
+              {$deceased_date}
             </div>
           </div>
         {else}

From d74f0adef718b6c1c844018b439951310f573197 Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Sat, 29 Jul 2017 11:48:50 +1000
Subject: [PATCH 07/86] Lint civicrm.install

---
 civicrm.install | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/civicrm.install b/civicrm.install
index b718ed6..6e0fd12 100644
--- a/civicrm.install
+++ b/civicrm.install
@@ -23,7 +23,7 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  *
@@ -32,10 +32,9 @@
  * $Id$
  *
  */
-function civicrm_install() {}
 
 /**
- * Implementation of hook_uninstall( )
+ * Implements hook_uninstall().
  */
 function civicrm_uninstall() {
   require_once 'civicrm.module';
@@ -58,7 +57,7 @@ function civicrm_requirements($phase) {
   //remove the last occurrence of 'drupal' from path
   $pos = strrpos($civicrm_path, 'drupal');
 
-  if ($pos !== false) {
+  if ($pos !== FALSE) {
     $civicrm_path = substr_replace($civicrm_path, '', $pos, strlen($civicrm_path));
   }
 
@@ -66,11 +65,12 @@ function civicrm_requirements($phase) {
 
   $settings = glob('sites/*/civicrm.settings.php');
   $problems = array();
+  $t = get_t();
   if (empty($settings) && $phase == 'install') {
     $problems[] = array(
-      'title' => t('CiviCRM settings does not exist'),
+      'title' => $t('CiviCRM settings does not exist'),
       'value' =>
-      t('CiviCRM settings file does not exist. It should be created by CiviCRM <a href="!link">install</a>',
+      $t('CiviCRM settings file does not exist. It should be created by CiviCRM <a href="!link">install</a>',
         array('!link' => $url)),
       'severity' => REQUIREMENT_ERROR,
     );
@@ -94,4 +94,3 @@ function civicrm_update_7401($sandbox) {
   // cleared when update_finished() is called.
   return t('TZ changes in CiviCRM Views picked up.');
 }
-

From 6cb553890d8260ead3c9b9054954192a6d43963f Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Sat, 29 Jul 2017 12:15:06 +1000
Subject: [PATCH 08/86] Lint civicrm.module

---
 civicrm.install | 31 +++++++++++++++++++++
 civicrm.module  | 72 +++++++++++--------------------------------------
 2 files changed, 47 insertions(+), 56 deletions(-)

diff --git a/civicrm.install b/civicrm.install
index 6e0fd12..7e38031 100644
--- a/civicrm.install
+++ b/civicrm.install
@@ -33,6 +33,37 @@
  *
  */
 
+/**
+ * Enable CiviCRM.
+ */
+function civicrm_enable() {
+  db_query("UPDATE {system} SET weight = 100 WHERE name = 'civicrm'");
+
+  menu_rebuild();
+
+  menu_link_maintain('civicrm', 'delete', 'civicrm', 'CiviCRM');
+
+  $options = array(
+    'link_title' => 'CiviCRM',
+    'link_path' => 'civicrm/dashboard',
+    'module' => 'civicrm',
+    'options' => array('alter' => TRUE),
+  );
+  menu_link_save($options);
+
+  if (!civicrm_initialize()) {
+    return;
+  }
+
+  // also invoke civicrm menu rebuild
+  CRM_Core_Menu::store();
+
+  // Update the 'blocks' DB table with the blocks.
+  if (module_exists('block')) {
+    _block_rehash();
+  }
+}
+
 /**
  * Implements hook_uninstall().
  */
diff --git a/civicrm.module b/civicrm.module
index 1d52b31..e5eebf6 100644
--- a/civicrm.module
+++ b/civicrm.module
@@ -187,27 +187,24 @@ function civicrm_initialize() {
       )
     );
 
-    if (!include_once($settingsFile)) {
+    if (!include_once $settingsFile) {
       $failure = TRUE;
-      drupal_set_message("<strong><p class='error'>" .
-        t("Oops! - The CiviCRM settings file (civicrm.settings.php) was not found in the expected location ") .
-        "(" . $settingsFile . "). </p><p class='error'>" .
-        $errorMsgAdd . '</p></strong>'
-      );
+      $message = t("<strong><p class='error'> Oops! - The CiviCRM settings file (civicrm.settings.php) was not found in the expected location (!1) </p><p class='error'> !2 </p></strong>", array(
+        '!1' => $settingsFile,
+        '!2' => $errorMsgAdd,
+      ));
+      drupal_set_message($message);
       return FALSE;
     }
 
     // this does pretty much all of the civicrm initialization
-    if (!include_once('CRM/Core/Config.php')) {
+    if (!include_once 'CRM/Core/Config.php') {
       $failure = TRUE;
-      drupal_set_message("<strong><p class='error'>" .
-        t("Oops! - The path for including CiviCRM code files is not set properly. Most likely there is an error in the <em>civicrm_root</em> setting in your CiviCRM settings file (!1).",
-          array('!1' => $settingsFile)
-        ) .
-        "</p><p class='error'> &raquo; " .
-        t("civicrm_root is currently set to: <em>!1</em>.", array(
-          '!1' => $civicrm_root)) .
-        "</p><p class='error'>" . $errorMsgAdd . "</p></strong>"
+      drupal_set_message(t("<strong><p class='error'>Oops! - The path for including CiviCRM code files is not set properly. Most likely there is an error in the <em>civicrm_root</em> setting in your CiviCRM settings file (!1). </p><p class='error'> &raquo; civicrm_root is currently set to: <em>!2</em></p><p class='error'>!3</p></strong>", array(
+          '!1' => $settingsFile,
+          '!2' => $civicrm_root,
+          '!3' => $errorMsgAdd,
+        ))
       );
       return FALSE;
     }
@@ -477,7 +474,7 @@ function _civicrm_categories_access($profile_id) {
   }
 }
 
-/*
+/**
  * Translating profile menu title dynamicaly to overide caching
  */
 function civicrm_menu_alter(&$items) {
@@ -603,7 +600,6 @@ function civicrm_form_data($edit, &$user, $category, $reset, $doNotProcess = FAL
 
   $html = CRM_Core_BAO_UFGroup::getEditHTML($userID, $category, NULL, FALSE, $reset, $profileID, $doNotProcess, $ctype);
 
-
   if ($html) {
     $title = CRM_Core_DAO::getFieldValue("CRM_Core_DAO_UFGroup", $profileID, 'title', 'id');
     $html = civicrm_add_jquery($html);
@@ -644,7 +640,7 @@ function _civicrm_get_user_profile_id($name) {
     $profiles = civicrm_api3('uf_group', 'get', array(
       'title' => $name,
       'is_active' => 1,
-      'options' => array('limit' => 1,),
+      'options' => array('limit' => 1),
     ));
   }
 
@@ -696,8 +692,7 @@ function civicrm_user_form_validate($form, &$form_state) {
   $validated = TRUE;
 
   // check for either user/register or admin/people/create
-  $register =
-    ((arg(0) == 'user' && arg(1) == 'register') ||
+  $register = ((arg(0) == 'user' && arg(1) == 'register') ||
     (arg(0) == 'admin' && arg(1) == 'people' && arg(2) == 'create')
   ) ? TRUE : FALSE;
   $userID = NULL;
@@ -738,37 +733,6 @@ function civicrm_key_disable() {
   CRM_Core_Config::singleton()->keyDisable = TRUE;
 }
 
-/**
- * Enable CiviCRM.
- */
-function civicrm_enable() {
-  db_query("UPDATE {system} SET weight = 100 WHERE name = 'civicrm'");
-
-  menu_rebuild();
-
-  menu_link_maintain('civicrm', 'delete', 'civicrm', 'CiviCRM');
-
-  $options = array(
-    'link_title' => 'CiviCRM',
-    'link_path' => 'civicrm/dashboard',
-    'module' => 'civicrm',
-    'options' => array('alter' => TRUE),
-  );
-  menu_link_save($options);
-
-  if (!civicrm_initialize()) {
-    return;
-  }
-
-  // also invoke civicrm menu rebuild
-  CRM_Core_Menu::store();
-
-  // Update the 'blocks' DB table with the blocks.
-  if (module_exists('block')) {
-    _block_rehash();
-  }
-}
-
 /**
  * Implements hook_translated_menu_item_alter().
  *
@@ -942,7 +906,7 @@ function civicrm_user_admin_permissions_submit($form, &$form_state) {
   }
 }
 
-/*
+/**
  *
  * Implements hook_theme_registry_alter().
  *
@@ -954,7 +918,6 @@ function civicrm_user_admin_permissions_submit($form, &$form_state) {
  * Also, add civicrm parameters to links so they are not truncated by the
  * language switcher.
  *
- * @param array $theme_registry
  *   Registry theme metadata.
  */
 function civicrm_theme_registry_alter(&$theme_registry) {
@@ -1250,8 +1213,6 @@ function civicrm_reviews() {
 
 /**
  * Implements hook_modules_installed().
- *
- * @param array $modules
  */
 function civicrm_modules_installed($modules) {
   civicrm_initialize();
@@ -1290,7 +1251,6 @@ function civicrm_modules_uninstalled($modules) {
  *
  * If the metatag module is not installed this function will not fire.
  *
- * @param array $cid_parts
  */
 function civicrm_metatag_page_cache_cid_parts_alter(&$cid_parts) {
   // Avoid substr() because it will not work with Drupal language prefixes.

From 428460e43c8bd6ef73c1af77e45e8f20d963b929 Mon Sep 17 00:00:00 2001
From: "deb.monish" <deb.monish@gmail.com>
Date: Mon, 7 Aug 2017 12:38:33 +0530
Subject: [PATCH 09/86] CRM-21016: Allow Drupal views to be used for Notes
 related to contributions

---
 modules/views/components/civicrm.core.inc | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/modules/views/components/civicrm.core.inc b/modules/views/components/civicrm.core.inc
index 30691de..db509de 100644
--- a/modules/views/components/civicrm.core.inc
+++ b/modules/views/components/civicrm.core.inc
@@ -1139,24 +1139,23 @@ function _civicrm_core_data(&$data, $enabled) {
   civicrm_views_add_fields($fields, $data['civicrm_address'], 'civicrm_address');
 
   // CIVICRM_NOTE table
-
   $data['civicrm_note']['table']['group'] = t('CiviCRM Note');
+  $data['civicrm_note']['table']['join'] = array();
 
-  // Explain how this table joins to others.
-  $data['civicrm_note']['table']['join'] = array(
-    // Directly links to contact table.
-    'civicrm_contact' => array(
+  foreach (array_keys(CRM_Core_BAO_Note::entityTables()) as $entityTable) {
+    // Explain how this table joins to others.
+    $data['civicrm_note']['table']['join'][$entityTable] = array(
       'left_field' => 'id',
       'field' => 'entity_id',
       'extra' => array(
         array(
           'field' => 'entity_table',
-          'value' => 'civicrm_contact',
+          'value' => $entityTable,
           'numeric' => FALSE,
         ),
       ),
-    ),
-  );
+    );
+  }
 
   // NOTE TEXT
   $data['civicrm_note']['note'] = array(

From 4a368f086e059a4077349b0f60fb41e58a627a9b Mon Sep 17 00:00:00 2001
From: John Kirk <accounts@civifirst.com>
Date: Thu, 10 Aug 2017 15:47:53 +0000
Subject: [PATCH 10/86] Add Contributions relevant to the Participant record.

---
 modules/views/components/civicrm.event.inc | 38 ++++++++++++++++++++--
 1 file changed, 35 insertions(+), 3 deletions(-)

diff --git a/modules/views/components/civicrm.event.inc b/modules/views/components/civicrm.event.inc
index 87bde5a..8360e44 100644
--- a/modules/views/components/civicrm.event.inc
+++ b/modules/views/components/civicrm.event.inc
@@ -656,17 +656,49 @@ function _civicrm_event_data(&$data, $enabled) {
       ),
     );
   }
-  // HOP SCOTCHING OUR WAY THROUGH THE CIVICRM_PARTICIPANT_PAYMENT
 
-  // Explain how this table joins to others.
+  // Add the Contribution relevant to the Participant.
+  $data['civicrm_participant_payment']['table']['group'] = t('Participant Payment (Contributions)');
+
+  $data['civicrm_participant_payment']['table']['base'] = array(
+    'field' => 'id',
+    'title' => t('Participant Payment (Contributions)'),
+    'help' => t("View participant's Contributions (for paid events)."),
+  );
+
   $data['civicrm_participant_payment']['table']['join'] = array(
-    // Directly links to event table
     'civicrm_participant' => array(
       'left_field' => 'id',
       'field' => 'participant_id',
     ),
   );
 
+  $data['civicrm_participant_payment']['contribution_id'] = array(
+    'title' => t('Participant Contribution Id'),
+    'help' => t('The numeric ID of the Participant\'s Contribution (for event fees).'),
+    'field' => array(
+      'handler' => 'views_handler_field_numeric',
+      'click sortable' => TRUE,
+    ),
+    'argument' => array(
+      'handler' => 'views_handler_argument_numeric',
+      'numeric' => TRUE,
+    ),
+    'filter' => array(
+      'handler' => 'views_handler_filter_numeric',
+    ),
+    'sort' => array(
+      'handler' => 'views_handler_sort',
+    ),
+    'relationship' => array(
+      'base' => 'civicrm_contribution',
+      'left_field' => 'id',
+      'field' => 'contribution_id',
+      'handler' => 'views_handler_relationship',
+      'label' => t('CiviCRM Participant Payment, with custom fields'),
+    ),
+  );
+
   //Event Text Link
   $data['civicrm_event']['text_link'] = array(
     'field' => array(

From 5f74c049cc78135f3a3236c0bac7f7059cd7f820 Mon Sep 17 00:00:00 2001
From: John Kirk <accounts@civifirst.com>
Date: Sun, 27 Aug 2017 00:34:16 +0000
Subject: [PATCH 11/86] Fixed CRM-20292: removed permission checks for custom
 data caching in views. This breaks views unless there is an ACL in place if
 Drush CC is used on the command line.

---
 modules/views/civicrm.views.inc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/views/civicrm.views.inc b/modules/views/civicrm.views.inc
index 4fa0275..d514aa2 100644
--- a/modules/views/civicrm.views.inc
+++ b/modules/views/civicrm.views.inc
@@ -327,7 +327,8 @@ function civicrm_views_custom_data_cache(&$data, $entity_type, $group_id, $sub_t
     return;
   }
   // From http://forum.civicrm.org/index.php/topic,17658.msg73901.html#msg73901, CRM-7860.
-  $tree = CRM_Core_BAO_CustomGroup::getTree($entity_type, NULL, NULL, $group_id, $sub_type, NULL);
+  // Checking permissions results in bug CRM-20292.
+  $tree = CRM_Core_BAO_CustomGroup::getTree($entity_type, NULL, NULL, $group_id, $sub_type, NULL, TRUE, NULL, FALSE, FALSE);
 
   $join_table = civicrm_views_get_join_table($entity_type);
   foreach ($tree as $groupkey => $current_group) {

From 91c959cd85bca921e5e332f8097359b0b66d92f9 Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Sun, 27 Aug 2017 12:03:46 +1000
Subject: [PATCH 12/86] Lint civicrm.drush.inc

---
 drush/civicrm.drush.inc | 223 ++++++++++++++++++----------------------
 1 file changed, 102 insertions(+), 121 deletions(-)

diff --git a/drush/civicrm.drush.inc b/drush/civicrm.drush.inc
index 5649303..adbf2ba 100644
--- a/drush/civicrm.drush.inc
+++ b/drush/civicrm.drush.inc
@@ -23,7 +23,7 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  *
@@ -49,7 +49,7 @@
  */
 
 /**
- * Implementation of hook_drush_command().
+ * Implements hook_drush_command().
  *
  * In this hook, you specify which commands your
  * drush module makes available, what it does and
@@ -60,8 +60,6 @@
  *
  * @See drush_parse_command() for a list of recognized keys.
  *
- * @return
- *   An associative array describing your command(s).
  */
 function civicrm_drush_command() {
   $items = array();
@@ -69,8 +67,7 @@ function civicrm_drush_command() {
   // the key in the $items array is the name of the command.
   $items['civicrm-api'] = array(
     'description' => 'CLI access to CiviCRM APIs. It can return pretty-printor json formatted data.',
-    'examples' =>
-    array(
+    'examples' => array(
       'drush civicrm-api contact.create first_name=John last_name=Doe contact_type=Individual' => 'Create a new contact named John Doe',
       'drush civicrm-api contact.create id=1 --out=json' => 'Find/display a contact in JSON format',
     ),
@@ -82,8 +79,7 @@ function civicrm_drush_command() {
   );
   $items['civicrm-install'] = array(
     'description' => "Install a new instance of CiviCRM.",
-    'options' =>
-    array(
+    'options' => array(
       'dbuser' => 'MySQL username for your Drupal/CiviCRM database.',
       'dbpass' => 'MySQL password for your Drupal/CiviCRM database.',
       'dbhost' => 'MySQL host for your Drupal/CiviCRM database. Defaults to localhost.',
@@ -145,10 +141,8 @@ function civicrm_drush_command() {
   );
   $items['civicrm-update-cfg'] = array(
     'description' => "Update config_backend to correct config settings, especially when the CiviCRM site has been cloned / migrated.",
-    'examples' =>
-    array(
-      'drush -l http://example.com/civicrm civicrm-update-cfg' =>
-      'Update config_backend to correct config settings for civicrm installation on example.com site.',
+    'examples' => array(
+      'drush -l http://example.com/civicrm civicrm-update-cfg' => 'Update config_backend to correct config settings for civicrm installation on example.com site.',
     ),
     'aliases' => array('cvupcfg'),
   );
@@ -160,45 +154,32 @@ function civicrm_drush_command() {
   );
   $items['civicrm-upgrade'] = array(
     'description' => "Replace CiviCRM codebase with new specified tarfile and upgrade database by executing the CiviCRM upgrade process - civicrm/upgrade?reset=1.",
-    'examples' =>
-    array(
-      'drush civicrm-upgrade --tarfile=~/tarballs/civicrm-4.1.2-drupal.tar.gz' =>
-      'Replace old CiviCRM codebase with new v4.1.2 and run upgrade process.',
+    'examples' => array(
+      'drush civicrm-upgrade --tarfile=~/tarballs/civicrm-4.1.2-drupal.tar.gz' => 'Replace old CiviCRM codebase with new v4.1.2 and run upgrade process.',
     ),
-    'options' =>
-    array(
-      'tarfile' =>
-      'Path of new CiviCRM tarfile, with which current CiviCRM codebase is to be replaced.',
-      'backup-dir' =>
-      'Specify a directory to backup current CiviCRM codebase and database into, defaults to a backup directory above your Drupal root.',
+    'options' => array(
+      'tarfile' => 'Path of new CiviCRM tarfile, with which current CiviCRM codebase is to be replaced.',
+      'backup-dir' => 'Specify a directory to backup current CiviCRM codebase and database into, defaults to a backup directory above your Drupal root.',
     ),
     'aliases' => array('cvup'),
   );
   $items['civicrm-restore'] = array(
     'description' => 'Restore CiviCRM codebase and database back from the specified backup directory.',
-    'examples' =>
-    array(
-      'drush civicrm-restore --restore-dir=../backup/modules/20100309200249' =>
-      'Replace current civicrm codebase with the $restore-dir/civicrm codebase, and reload the database with $restore-dir/civicrm.sql file',
+    'examples' => array(
+      'drush civicrm-restore --restore-dir=../backup/modules/20100309200249' => 'Replace current civicrm codebase with the $restore-dir/civicrm codebase, and reload the database with $restore-dir/civicrm.sql file',
     ),
-    'options' =>
-    array(
-      'restore-dir' =>
-      'Path of directory having backed up CiviCRM codebase and database.',
-      'backup-dir' =>
-      'Specify a directory to backup current CiviCRM codebase and database into, defaults to a backup directory above your Drupal root.',
+    'options' => array(
+      'restore-dir' => 'Path of directory having backed up CiviCRM codebase and database.',
+      'backup-dir' => 'Specify a directory to backup current CiviCRM codebase and database into, defaults to a backup directory above your Drupal root.',
     ),
   );
   $items['civicrm-rest'] = array(
     'description' => "Rest interface for accessing CiviCRM APIs. It can return xml or json formatted data.",
-    'examples' =>
-    array(
-      "drush civicrm-rest --query='civicrm/contact/search&json=1&key=7decb879f28ac4a0c6a92f0f7889a0c9&api_key=7decb879f28ac4a0c6a92f0f7889a0c9'" =>
-      'Use contact search api to return data in json format.',
+    'examples' => array(
+      "drush civicrm-rest --query='civicrm/contact/search&json=1&key=7decb879f28ac4a0c6a92f0f7889a0c9&api_key=7decb879f28ac4a0c6a92f0f7889a0c9'" => 'Use contact search api to return data in json format.',
     ),
     // TODO: This really makes more sense as an argument.
-    'options' =>
-    array('query' => 'Query part of url. Refer CiviCRM wiki doc for more details.'),
+    'options' => array('query' => 'Query part of url. Refer CiviCRM wiki doc for more details.'),
     'aliases' => array('cvr'),
   );
   $items['civicrm-sql-conf'] = array(
@@ -250,10 +231,8 @@ function civicrm_drush_command() {
   );
   $items['civicrm-process-mail-queue'] = array(
     'description' => "Process pending CiviMail mailing jobs.",
-    'examples' =>
-    array(
-      'drush civicrm-process-mail-queue -u admin' =>
-      'Process CiviMail queue with admin credentials.',
+    'examples' => array(
+      'drush civicrm-process-mail-queue -u admin' => 'Process CiviMail queue with admin credentials.',
     ),
   );
   $items['civicrm-member-records'] = array(
@@ -271,8 +250,8 @@ function civicrm_drush_command() {
  */
 function drush_civicrm_get_db_spec() {
   if (version_compare(DRUSH_VERSION, 7, '>=')) {
-      $sql = drush_sql_get_class();
-      $db_spec = $sql->db_spec();
+    $sql = drush_sql_get_class();
+    $db_spec = $sql->db_spec();
   }
   else {
     $db_spec = _drush_sql_get_db_spec();
@@ -281,7 +260,7 @@ function drush_civicrm_get_db_spec() {
 }
 
 /**
- * Implementation of drush_hook_COMMAND_validate for command 'civicrm-install'
+ * Implements hook_COMMAND_validate() for civicrm-install().
  */
 function drush_civicrm_install_validate() {
   // TODO: Replace these with required options (Drush 5).
@@ -309,9 +288,9 @@ function drush_civicrm_install_validate() {
     drush_set_option('dbname', $db_spec['database']);
   }
 
-  $crmpath    = _civicrm_get_crmpath();
+  $crmpath = _civicrm_get_crmpath();
   $drupalRoot = drush_get_context('DRUSH_DRUPAL_ROOT');
-  $modPath    = "$drupalRoot/$crmpath";
+  $modPath = "$drupalRoot/$crmpath";
 
   if (!is_dir("$modPath/civicrm") && !drush_get_option('tarfile', FALSE)) {
     return drush_set_error('CIVICRM_INSTALL_TARFILE_NOT_SPECIFIED', dt('CiviCRM tarfile not specified.'));
@@ -333,10 +312,10 @@ function drush_civicrm_install() {
   $dbhost = drush_get_option('dbhost', FALSE);
   $dbname = drush_get_option('dbname', FALSE);
 
-  $crmpath    = _civicrm_get_crmpath();
+  $crmpath = _civicrm_get_crmpath();
   $drupalRoot = drush_get_context('DRUSH_DRUPAL_ROOT');
-  $modPath    = "$drupalRoot/$crmpath";
-  $lang       = drush_get_option('lang', '');
+  $modPath = "$drupalRoot/$crmpath";
+  $lang = drush_get_option('lang', '');
   $loadGeneratedData = drush_get_option('load_generated_data', FALSE);
 
   if (!is_dir("$modPath/civicrm")) {
@@ -380,7 +359,7 @@ function _civicrm_extract_tarfile($destinationPath, $option = 'tarfile') {
 }
 
 function _civicrm_install_db($dbuser, $dbpass, $dbhost, $dbname,
-  $modPath, $lang, $loadGeneratedData
+                             $modPath, $lang, $loadGeneratedData
 ) {
   $drupalRoot = drush_get_context('DRUSH_DRUPAL_ROOT');
   $siteRoot = drush_get_context('DRUSH_DRUPAL_SITE_ROOT', FALSE);
@@ -421,8 +400,8 @@ function _civicrm_install_db($dbuser, $dbpass, $dbhost, $dbname,
     }
     else {
       drush_log(dt("No sql files could be retrieved for \"" . $lang .
-          "\", using default language."
-        ), 'warning');
+        "\", using default language."
+      ), 'warning');
     }
   }
   civicrm_source($dsn, $data_file);
@@ -452,15 +431,17 @@ function _civicrm_create_files_dirs($civicrmInstallerHelper, $modPath) {
   return TRUE;
 }
 
-// generates civicrm.settings.php file
+/**
+ * Generates civicrm.settings.php file
+ */
 function _civicrm_generate_settings_file($dbuser, $dbpass, $dbhost, $dbname, $modPath) {
   $drupalRoot = drush_get_context('DRUSH_DRUPAL_ROOT');
-  $siteRoot   = drush_get_context('DRUSH_DRUPAL_SITE_ROOT', FALSE);
-  $crmPath    = "$modPath/civicrm";
+  $siteRoot = drush_get_context('DRUSH_DRUPAL_SITE_ROOT', FALSE);
+  $crmPath = "$modPath/civicrm";
 
   $files = array(
     "$crmPath/templates/CRM/common/civicrm.settings.php.template",
-    "$crmPath/templates/CRM/common/civicrm.settings.php.tpl"
+    "$crmPath/templates/CRM/common/civicrm.settings.php.tpl",
   );
 
   $settingsTplFile = NULL;
@@ -528,16 +509,11 @@ function _civicrm_generate_settings_file($dbuser, $dbpass, $dbhost, $dbname, $mo
 }
 
 /**
- * Implementation of hook_drush_help().
+ * Implements hook_drush_help().
  *
  * This function is called whenever a drush user calls
  * 'drush help <name-of-your-command>'
  *
- * @param
- *   A string with the help section (prepend with 'drush:')
- *
- * @return
- *   A string with the help text for your command.
  */
 function civicrm_drush_help($section) {
   switch ($section) {
@@ -578,7 +554,7 @@ function civicrm_drush_help($section) {
  */
 function drush_civicrm_ext_list() {
   civicrm_initialize();
-  try{
+  try {
     $result = civicrm_api3('extension', 'get', array(
       'options' => array(
         'limit' => 0,
@@ -608,11 +584,12 @@ function drush_civicrm_ext_list() {
  */
 function drush_civicrm_ext_install($extension_name) {
   civicrm_initialize();
-  try{
+  try {
     $result = civicrm_api('extension', 'install', array('key' => $extension_name, 'version' => 3));
-    if($result['values'] && $result['values'] == 1) {
+    if ($result['values'] && $result['values'] == 1) {
       drush_print(dt("Extension !ename installed.", array('!ename' => $extension_name)));
-    } else {
+    }
+    else {
       drush_log(t('Extension !ename could not be installed.', array('!ename' => $extension_name)), 'error');
     }
   }
@@ -630,11 +607,12 @@ function drush_civicrm_ext_install($extension_name) {
  */
 function drush_civicrm_ext_disable($extension_name) {
   civicrm_initialize();
-  try{
+  try {
     $result = civicrm_api('extension', 'disable', array('key' => $extension_name, 'version' => 3));
-    if($result['values'] && $result['values'] == 1) {
+    if ($result['values'] && $result['values'] == 1) {
       drush_print(dt("Extension !ename disabled.", array('!ename' => $extension_name)));
-    } else {
+    }
+    else {
       drush_log(t('Extension !ename could not be disabled.', array('!ename' => $extension_name)), 'error');
     }
   }
@@ -652,11 +630,12 @@ function drush_civicrm_ext_disable($extension_name) {
  */
 function drush_civicrm_ext_uninstall($extension_name) {
   civicrm_initialize();
-  try{
+  try {
     $result = civicrm_api('extension', 'uninstall', array('key' => $extension_name, 'version' => 3));
-    if($result['values'] && $result['values'] == 1) {
+    if ($result['values'] && $result['values'] == 1) {
       drush_print(dt("Extension !ename uninstalled.", array('!ename' => $extension_name)));
-    } else {
+    }
+    else {
       drush_log(t('Extension !ename could not be uninstalled.', array('!ename' => $extension_name)), 'error');
     }
   }
@@ -670,7 +649,7 @@ function drush_civicrm_ext_uninstall($extension_name) {
 }
 
 /**
- * Implementation of drush_hook_COMMAND_validate for command 'civicrm-upgrade-db'
+ * Implements drush_hook_COMMAND_validate() for civicrm-upgrade-db().
  */
 function drush_civicrm_upgrade_db_validate() {
   if (!defined('CIVICRM_UPGRADE_ACTIVE')) {
@@ -730,7 +709,7 @@ function drush_civicrm_upgrade_db() {
     require_once 'CRM/Core/Smarty.php';
     $template = CRM_Core_Smarty::singleton();
 
-    require_once ('CRM/Upgrade/Page/Upgrade.php');
+    require_once 'CRM/Upgrade/Page/Upgrade.php';
     $upgrade = new CRM_Upgrade_Page_Upgrade();
 
     // new since CiviCRM 4.1
@@ -750,7 +729,7 @@ function drush_civicrm_upgrade_db() {
 }
 
 /**
- * Implementation of drush_hook_COMMAND_validate for command 'civicrm-update-cfg'
+ * Implements drush_hook_COMMAND_validate() for civicrm-update-cfg().
  */
 function drush_civicrm_update_cfg_validate() {
   return _civicrm_init();
@@ -782,11 +761,13 @@ function drush_civicrm_update_cfg() {
     drush_log(dt('Config successfully updated.'), 'completed');
 
   }
-  else drush_log(dt('Config update failed.'), 'failed');
+  else {
+    drush_log(dt('Config update failed.'), 'failed');
+  }
 }
 
 /**
- * Implements hook_drush_cache_clear.
+ * Implements hook_drush_cache_clear().
  */
 function civicrm_drush_cache_clear(&$types) {
   if (_civicrm_init(FALSE)) {
@@ -833,7 +814,7 @@ function drush_civicrm_cacheclear() {
 }
 
 /**
- * Implementation of drush_hook_COMMAND_validate for command 'civicrm-enable-debug'
+ * Implements drush_hook_COMMAND_validate() for civicrm-enable-debug().
  */
 function drush_civicrm_enable_debug_validate() {
   return _civicrm_init();
@@ -858,7 +839,7 @@ function drush_civicrm_enable_debug() {
 }
 
 /**
- * Implementation of drush_hook_COMMAND_validate for command 'civicrm-disable-debug'
+ * Implements drush_hook_COMMAND_validate() for civicrm-disable-debug().
  */
 function drush_civicrm_disable_debug_validate() {
   return _civicrm_init();
@@ -883,7 +864,7 @@ function drush_civicrm_disable_debug() {
 }
 
 /**
- * Implementation of drush_hook_COMMAND_validate for command 'civicrm-upgrade'
+ * Implements drush_hook_COMMAND_validate() for civicrm-upgrade().
  */
 function drush_civicrm_upgrade_validate() {
   // TODO: use Drush to download tarfile.
@@ -906,8 +887,8 @@ function drush_civicrm_upgrade_validate() {
 function drush_civicrm_upgrade() {
   global $civicrm_root;
 
-  $tarfile     = drush_get_option('tarfile', FALSE);
-  $date        = date('YmdHis');
+  $tarfile = drush_get_option('tarfile', FALSE);
+  $date = date('YmdHis');
   $backup_file = "civicrm";
 
   $basepath = explode('/', $civicrm_root);
@@ -915,19 +896,19 @@ function drush_civicrm_upgrade() {
   $project_path = implode('/', $basepath) . '/';
 
   $drupal_root = drush_get_context('DRUSH_DRUPAL_ROOT');
-  $backup_dir  = drush_get_option('backup-dir', $drupal_root . '/../backup');
-  $backup_dir  = rtrim($backup_dir, '/');
+  $backup_dir = drush_get_option('backup-dir', $drupal_root . '/../backup');
+  $backup_dir = rtrim($backup_dir, '/');
 
   drush_print(dt("\nThe upgrade process involves - "));
   drush_print(dt("1. Backing up current CiviCRM code as => !path",
-      array('!path' => "$backup_dir/modules/$date/$backup_file")
-    ));
+    array('!path' => "$backup_dir/modules/$date/$backup_file")
+  ));
   drush_print(dt("2. Backing up database as => !path",
-      array('!path' => "$backup_dir/modules/$date/$backup_file.sql")
-    ));
+    array('!path' => "$backup_dir/modules/$date/$backup_file.sql")
+  ));
   drush_print(dt("3. Unpacking tarfile to => !path",
-      array('!path' => "$project_path")
-    ));
+    array('!path' => "$project_path")
+  ));
   drush_print(dt("4. Executing civicrm/upgrade?reset=1 just as a browser would.\n"));
   if (!drush_confirm(dt('Do you really want to continue?'))) {
     return drush_user_abort();
@@ -941,8 +922,8 @@ function drush_civicrm_upgrade() {
   $backup_target = $backup_dir . '/' . $backup_file;
   if (!drush_op('rename', $civicrm_root, $backup_target)) {
     return drush_set_error('CIVICRM_BACKUP_FAILED', dt('Failed to backup CiviCRM project directory !source to !backup_target',
-        array('!source' => $civicrm_root, '!backup_target' => $backup_target)
-      ));
+      array('!source' => $civicrm_root, '!backup_target' => $backup_target)
+    ));
   }
   drush_log(dt("\n1. Code backed up."), 'ok');
 
@@ -963,7 +944,7 @@ function drush_civicrm_upgrade() {
 }
 
 /**
- * Implementation of drush_hook_COMMAND_validate for command 'civicrm-restore'
+ * Implements drush_hook_COMMAND_validate() for civicrm-restore().
  */
 function drush_civicrm_restore_validate() {
   _civicrm_dsn_init();
@@ -994,16 +975,16 @@ function drush_civicrm_restore_validate() {
 function drush_civicrm_restore() {
   $restore_dir = drush_get_option('restore-dir', FALSE);
   $restore_dir = rtrim($restore_dir, '/');
-  $sql_file    = $restore_dir . '/civicrm.sql';
-  $code_dir    = $restore_dir . '/civicrm';
-  $date        = date('YmdHis');
+  $sql_file = $restore_dir . '/civicrm.sql';
+  $code_dir = $restore_dir . '/civicrm';
+  $date = date('YmdHis');
 
   global $civicrm_root;
   $civicrm_root_base = explode('/', $civicrm_root);
   array_pop($civicrm_root_base);
   $civicrm_root_base = implode('/', $civicrm_root_base) . '/';
 
-  $drupal_root        = drush_get_context('DRUSH_DRUPAL_ROOT');
+  $drupal_root = drush_get_context('DRUSH_DRUPAL_ROOT');
   $restore_backup_dir = drush_get_option('backup-dir', $drupal_root . '/../backup');
   $restore_backup_dir = rtrim($restore_backup_dir, '/');
 
@@ -1015,8 +996,8 @@ function drush_civicrm_restore() {
   drush_print(dt("3. Loading '\$restore-dir/civicrm.sql' file into the database."));
   drush_print();
   drush_print(dt("Note: Before restoring a backup will be taken in '!path' directory.",
-      array('!path' => "$restore_backup_dir/modules/restore")
-    ));
+    array('!path' => "$restore_backup_dir/modules/restore")
+  ));
   drush_print();
   if (!drush_confirm(dt('Do you really want to continue?'))) {
     return drush_user_abort();
@@ -1035,13 +1016,13 @@ function drush_civicrm_restore() {
   drush_log(dt('Restoring civicrm codebase ..'));
   if (is_dir($civicrm_root) && !drush_op('rename', $civicrm_root, $restore_backup_dir . '/civicrm')) {
     return drush_set_error('CIVICRM_RESTORE_CODE_FAILED', dt("Failed to take backup for '!destination' directory",
-        array('!destination' => $civicrm_root)
-      ));
+      array('!destination' => $civicrm_root)
+    ));
   }
   if (!drush_op('rename', $code_dir, $civicrm_root)) {
     return drush_set_error('CIVICRM_RESTORE_DESTINATION_FAILED', dt("Failed to restore civicrm directory '!source' to '!dest'",
-        array('!source' => $code_dir, '!dest' => $civicrm_root_base)
-      ));
+      array('!source' => $code_dir, '!dest' => $civicrm_root_base)
+    ));
   }
   drush_log(dt('Codebase restored.'), 'ok');
 
@@ -1116,7 +1097,7 @@ function drush_civicrm_member_records() {
 
   $_REQUEST['name'] = drush_get_option('civicrm_cron_username', NULL);
   $_REQUEST['pass'] = drush_get_option('civicrm_cron_password', NULL);
-  $_REQUEST['key']  = drush_get_option('civicrm_sitekey', NULL);
+  $_REQUEST['key'] = drush_get_option('civicrm_sitekey', NULL);
 
   global $argv;
   $argv = array(
@@ -1134,7 +1115,7 @@ function drush_civicrm_member_records() {
 }
 
 /**
- * Implementation of drush_hook_COMMAND_validate for command 'civicrm-rest' ('cvr')
+ * Implements drush_hook_COMMAND_validate() for civicrm-rest().
  */
 function drush_civicrm_rest_validate() {
   $query = drush_get_option('query', FALSE);
@@ -1149,8 +1130,8 @@ function drush_civicrm_rest_validate() {
  * Implementation of command 'civicrm-rest' ('cvr')
  */
 function drush_civicrm_rest() {
-  $query     = drush_get_option('query', FALSE);
-  $query     = explode('&', $query);
+  $query = drush_get_option('query', FALSE);
+  $query = explode('&', $query);
   $_GET['q'] = array_shift($query);
   foreach ($query as $keyVal) {
     list($key, $val) = explode('=', $keyVal);
@@ -1478,8 +1459,8 @@ function _civicrm_init($fail = TRUE, $load_config = TRUE) {
   }
 
   global $cmsPath;
-  $cmsPath             = $drupal_root = drush_get_context('DRUSH_DRUPAL_ROOT');
-  $site_root           = drush_get_context('DRUSH_DRUPAL_SITE_ROOT', FALSE);
+  $cmsPath = $drupal_root = drush_get_context('DRUSH_DRUPAL_ROOT');
+  $site_root = drush_get_context('DRUSH_DRUPAL_SITE_ROOT', FALSE);
   $civicrmSettingsFile = "$drupal_root/$site_root/civicrm.settings.php";
 
   if (!file_exists($civicrmSettingsFile)) {
@@ -1603,20 +1584,20 @@ function drush_civicrm_sync_users_contacts() {
     )
   );
   if ($result['contactMatching']) {
-    $status .=  PHP_EOL . ts('Found one matching contact record.',
-      array(
-        'count' => $result['contactMatching'],
-        'plural' => 'Found %count matching contact records.',
-      )
-    );
+    $status .= PHP_EOL . ts('Found one matching contact record.',
+        array(
+          'count' => $result['contactMatching'],
+          'plural' => 'Found %count matching contact records.',
+        )
+      );
   }
 
   $status .= PHP_EOL . ts('Created one new contact record.',
-    array(
-      'count' => $result['contactCreated'],
-      'plural' => 'Created %count new contact records.',
-    )
-  );
+      array(
+        'count' => $result['contactCreated'],
+        'plural' => 'Created %count new contact records.',
+      )
+    );
   drush_print(dt($status));
   return $result;
 }

From e2056e2fae91d1e7a7188407dd7c3cc6e5a0c560 Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Tue, 29 Aug 2017 06:22:10 +1000
Subject: [PATCH 13/86] (NFC) Civilint Some views files and HookTest file

---
 modules/views/civicrm.views.inc         | 252 ++++++++++--------------
 modules/views/civicrm.views_default.inc |  19 +-
 tests/phpunit/CiviDrupal/HookTest.php   |   1 +
 3 files changed, 112 insertions(+), 160 deletions(-)

diff --git a/modules/views/civicrm.views.inc b/modules/views/civicrm.views.inc
index 4fa0275..dfcd462 100644
--- a/modules/views/civicrm.views.inc
+++ b/modules/views/civicrm.views.inc
@@ -21,7 +21,7 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /*
    * Copyright (C) 2009 James Rakich
@@ -61,7 +61,8 @@
    */
 
 /**
- * Implements of hook_views_data().
+ * Implements hook_views_data().
+ *
  * Run hook_views_data for active CiviCRM components
  */
 function civicrm_views_data_alter(&$data) {
@@ -81,7 +82,7 @@ function civicrm_views_data_alter(&$data) {
   // Get list of enabled CiviCRM components
   $enabled = CRM_Core_Component::getEnabledComponents();
 
- // $data = array();
+  // $data = array();
   // Load Core CiviCRM data
   _civicrm_core_data($data, $enabled);
 
@@ -121,8 +122,9 @@ function civicrm_views_data_alter(&$data) {
     _civicrm_case_data($data, $enabled);
   }
   if (isset($enabled['CiviContribute']) ||
-      isset($enabled['CiviEvent']) ||
-      isset($enabled['CiviMember'])) {
+    isset($enabled['CiviEvent']) ||
+    isset($enabled['CiviMember'])
+  ) {
     include_once 'components/civicrm.price_set.inc';
     _civicrm_price_set_data($data, $enabled);
   }
@@ -221,11 +223,11 @@ function civicrm_views_add_fields(&$fields, &$data, $tableName, &$skipFields = N
 
     $type = CRM_Utils_Array::value('type', $value, 'String');
     $data[$value['name']] = array(
-      'title'    => $value['title'],
-      'help'     => $value['title'],
-      'field'    => civicrm_views_get_field($type),
-      'sort'     => civicrm_views_get_sort($type),
-      'filter'   => civicrm_views_get_filter($type),
+      'title' => $value['title'],
+      'help' => $value['title'],
+      'field' => civicrm_views_get_field($type),
+      'sort' => civicrm_views_get_sort($type),
+      'filter' => civicrm_views_get_filter($type),
       'argument' => civicrm_views_get_argument($type),
     );
 
@@ -319,8 +321,8 @@ function civicrm_views_add_date_arguments(&$data, $value) {
  * @param $sub_type
  *   (optional) Integer Id of the Sub-Type, ie Contact Sub Type
  *
- * @return $data
- *   Array with the new custom field appended
+ * @return mixed
+ *   $Data array with the new custom field appended or void
  */
 function civicrm_views_custom_data_cache(&$data, $entity_type, $group_id, $sub_type) {
   if (CRM_Core_Config::isUpgradeMode()) {
@@ -339,10 +341,10 @@ function civicrm_views_custom_data_cache(&$data, $entity_type, $group_id, $sub_t
     // Provide custom table data, including group title and implicit table join.
     $data[$current_group['table_name']]['table'] = array(
       'group' => t('CiviCRM Custom: !title', array('!title' => $current_group['title'])),
-      'join'  => array(
+      'join' => array(
         $join_table => array(
           'left_field' => 'id',
-          'field'      => 'entity_id',
+          'field' => 'entity_id',
         ),
       ),
     );
@@ -354,7 +356,7 @@ function civicrm_views_custom_data_cache(&$data, $entity_type, $group_id, $sub_t
       $data[$current_group['table_name']]['table']['join']['users'] = array(
         'left_table' => $join_table,
         'left_field' => 'id',
-        'field'      => 'entity_id',
+        'field' => 'entity_id',
       );
 
       // Expose custom data to contact view.
@@ -362,7 +364,7 @@ function civicrm_views_custom_data_cache(&$data, $entity_type, $group_id, $sub_t
         $data[$current_group['table_name']]['table']['join']['civicrm_contact'] = array(
           'left_table' => $join_table,
           'left_field' => 'id',
-          'field'      => 'entity_id',
+          'field' => 'entity_id',
         );
       }
     }
@@ -371,21 +373,21 @@ function civicrm_views_custom_data_cache(&$data, $entity_type, $group_id, $sub_t
       //Create the Views Field
       $option_group_id = isset($current_field['option_group_id']) ? $current_field['option_group_id'] : NULL;
       $data[$current_group['table_name']][$current_field['column_name']] = array(
-        'title'        => $current_field['label'],
-        'help'         => empty($current_field['help_post']) ? t('Custom Data Field') : $current_field['help_post'],
-        'field'        => civicrm_views_get_field($current_field['data_type'], $current_field['html_type']),
-        'argument'     => civicrm_views_get_argument($current_field['data_type']),
-        'filter'       => civicrm_views_get_filter($current_field['data_type'], $current_field['html_type'], $option_group_id),
-        'sort'         => civicrm_views_get_sort($current_field['data_type']),
+        'title' => $current_field['label'],
+        'help' => empty($current_field['help_post']) ? t('Custom Data Field') : $current_field['help_post'],
+        'field' => civicrm_views_get_field($current_field['data_type'], $current_field['html_type']),
+        'argument' => civicrm_views_get_argument($current_field['data_type']),
+        'filter' => civicrm_views_get_filter($current_field['data_type'], $current_field['html_type'], $option_group_id),
+        'sort' => civicrm_views_get_sort($current_field['data_type']),
         'relationship' => civicrm_views_get_relationship($current_field['data_type']),
       );
 
       //For date fields add in 6 arguments
       if ($current_field['data_type'] == 'Date') {
         //@TODO  Still need to get the field under it's respecitve group, I may e able to set the civicrm_views_add_date_arguments() function with a group variable and default it to null
-        $value          = array();
+        $value = array();
         $value['title'] = $current_field['label'];
-        $value['name']  = $current_field['column_name'];
+        $value['name'] = $current_field['column_name'];
         civicrm_views_add_date_arguments($data[$current_group['table_name']], $value);
       }
     }
@@ -403,29 +405,41 @@ function civicrm_views_get_join_table($entity_type) {
     case "Household":
     case "Organization":
       return 'civicrm_contact';
+
     case "Group":
       return 'civicrm_group';
+
     case "Address":
       return 'civicrm_address';
+
     case "Event":
       return 'civicrm_event';
+
     case "Participant":
       return 'civicrm_participant';
+
     case "Contribution":
       return 'civicrm_contribution';
+
     case "Activity":
       return 'civicrm_activity';
+
     case "Relationship":
       return 'civicrm_relationship';
+
     case "Membership":
       return 'civicrm_membership';
+
     case "Grant":
       return 'civicrm_grant';
+
     case "Campaign":
     case "Survey":
       return 'civicrm_campaign';
+
     case "Case":
       return 'civicrm_case';
+
     default:
       return NULL;
   }
@@ -439,7 +453,7 @@ function civicrm_views_get_join_table($entity_type) {
  * @param $html_type
  *   A String containing the field html type
  *
- * @return
+ * @return array
  *   An array containing the handler name and any extra settings
  */
 function civicrm_views_get_field($data_type, $html_type = NULL) {
@@ -466,53 +480,31 @@ function civicrm_views_get_field($data_type, $html_type = NULL) {
   switch ($data_type) {
     case "String":
     case "Memo":
-      return array(
-        'handler' => 'civicrm_handler_field_markup',
-        'click sortable' => TRUE,
-      );
+      return array('handler' => 'civicrm_handler_field_markup', 'click sortable' => TRUE);
+
     case "Float":
-      return array(
-        'handler' => 'views_handler_field_numeric',
-        'click sortable' => TRUE,
-        'float' => TRUE,
-      );
+      return array('handler' => 'views_handler_field_numeric', 'click sortable' => TRUE, 'float' => TRUE);
+
     case "Int":
-      return array(
-        'handler' => 'civicrm_handler_field_custom',
-        'click sortable' => TRUE,
-      );
+      return array('handler' => 'civicrm_handler_field_custom', 'click sortable' => TRUE);
+
     case "Date":
-      return array(
-        'handler' => 'civicrm_handler_field_datetime',
-        'click sortable' => TRUE,
-      );
+      return array('handler' => 'civicrm_handler_field_datetime', 'click sortable' => TRUE);
+
     case "Boolean":
-      return array(
-        'handler' => 'views_handler_field_boolean',
-        'click sortable' => TRUE,
-      );
+      return array('handler' => 'views_handler_field_boolean', 'click sortable' => TRUE);
+
     case "StateProvince":
-      return array(
-        'handler' => 'civicrm_handler_field_state',
-        'click sortable' => TRUE,
-      );
+      return array('handler' => 'civicrm_handler_field_state', 'click sortable' => TRUE);
+
     case "Country":
-      return array(
-        'handler' => 'civicrm_handler_field_country',
-        'click sortable' => TRUE,
-      );
+      return array('handler' => 'civicrm_handler_field_country', 'click sortable' => TRUE);
+
     case "County":
-      return array(
-        'handler' => 'civicrm_handler_field_pseudo_constant',
-        'click sortable' => TRUE,
-        'pseudo class' => 'CRM_Core_PseudoConstant',
-        'pseudo method' => 'county',
-      );
+      return array('handler' => 'civicrm_handler_field_pseudo_constant', 'click sortable' => TRUE, 'pseudo class' => 'CRM_Core_PseudoConstant', 'pseudo method' => 'county');
+
     default:
-      return array(
-        'views_handler_field',
-        'click sortable' => TRUE,
-      );
+      return array('views_handler_field', 'click sortable' => TRUE);
   }
 }
 
@@ -522,45 +514,36 @@ function civicrm_views_get_field($data_type, $html_type = NULL) {
  * @param $type
  *   A String containing the field type
  *
- * @return
+ * @return array
  *   An array containing the handler name and any extra settings
  */
 function civicrm_views_get_argument($type) {
   switch ($type) {
     case "String":
     case "Memo":
-      return array(
-        'handler' => 'views_handler_argument',
-      );
+      return array('handler' => 'views_handler_argument');
+
     case "Float":
     case "Int":
-      return array(
-        'handler' => 'views_handler_argument_numeric',
-      );
+      return array('handler' => 'views_handler_argument_numeric');
+
     case "Date":
-      return array(
-        'handler' => 'views_handler_argument_date',
-      );
+      return array('handler' => 'views_handler_argument_date');
+
     case "Boolean":
-      return array(
-        'handler' => 'views_handler_argument',
-      );
+      return array('handler' => 'views_handler_argument');
+
     case "StateProvince":
-      return array(
-        'handler' => 'views_handler_argument',
-      );
+      return array('handler' => 'views_handler_argument');
+
     case "Country":
-      return array(
-        'handler' => 'views_handler_argument',
-      );
+      return array('handler' => 'views_handler_argument');
+
     case "County":
-      return array(
-        'handler' => 'views_handler_argument',
-      );
+      return array('handler' => 'views_handler_argument');
+
     default:
-      return array(
-        'handler' => 'views_handler_argument',
-      );
+      return array('handler' => 'views_handler_argument');
   }
 }
 
@@ -572,7 +555,7 @@ function civicrm_views_get_argument($type) {
  * @param $html_type
  *   A string containing the field html type
  *
- * @return
+ * @return array
  *   An array containing the handler name and any extra settings
  */
 function civicrm_views_get_filter($data_type, $html_type = NULL, $option_group_id = NULL) {
@@ -583,7 +566,7 @@ function civicrm_views_get_filter($data_type, $html_type = NULL, $option_group_i
     'Multi-Select State/Province',
   );
   if ($html_type == 'Multi-Select Country') {
-    return  array(
+    return array(
       'handler' => 'civicrm_handler_filter_country_multi',
     );
   }
@@ -606,17 +589,11 @@ function civicrm_views_get_filter($data_type, $html_type = NULL, $option_group_i
   switch ($data_type) {
     case "String":
     case "Memo":
-      return array(
-        'handler' => 'views_handler_filter_string',
-        'allow empty' => TRUE,
-      );
+      return array('handler' => 'views_handler_filter_string', 'allow empty' => TRUE);
 
     case "Float":
     case "Int":
-      return array(
-        'handler' => 'views_handler_filter_numeric',
-        'allow empty' => TRUE,
-      );
+      return array('handler' => 'views_handler_filter_numeric', 'allow empty' => TRUE);
 
     case "Date":
       return array('handler' => 'civicrm_handler_filter_datetime');
@@ -625,34 +602,16 @@ function civicrm_views_get_filter($data_type, $html_type = NULL, $option_group_i
       return array('handler' => 'views_handler_filter_boolean_operator');
 
     case "StateProvince":
-      return array(
-        'handler' => 'civicrm_handler_filter_pseudo_constant',
-        'pseudo class' => 'CRM_Core_PseudoConstant',
-        'pseudo method' => 'stateProvince',
-        'allow empty' => TRUE,
-      );
+      return array('handler' => 'civicrm_handler_filter_pseudo_constant', 'pseudo class' => 'CRM_Core_PseudoConstant', 'pseudo method' => 'stateProvince', 'allow empty' => TRUE);
 
     case "Country":
-      return array(
-        'handler' => 'civicrm_handler_filter_pseudo_constant',
-        'pseudo class' => 'CRM_Core_PseudoConstant',
-        'pseudo method' => 'country',
-        'allow empty' => TRUE,
-      );
+      return array('handler' => 'civicrm_handler_filter_pseudo_constant', 'pseudo class' => 'CRM_Core_PseudoConstant', 'pseudo method' => 'country', 'allow empty' => TRUE);
 
     case "County":
-      return array(
-        'handler' => 'civicrm_handler_filter_pseudo_constant',
-        'pseudo class' => 'CRM_Core_PseudoConstant',
-        'pseudo method' => 'county',
-        'allow empty' => TRUE,
-      );
+      return array('handler' => 'civicrm_handler_filter_pseudo_constant', 'pseudo class' => 'CRM_Core_PseudoConstant', 'pseudo method' => 'county', 'allow empty' => TRUE);
 
     default:
-      return array(
-        'handler' => 'views_handler_filter_string',
-        'allow empty' => TRUE,
-      );
+      return array('handler' => 'views_handler_filter_string', 'allow empty' => TRUE);
   }
 }
 
@@ -662,7 +621,7 @@ function civicrm_views_get_filter($data_type, $html_type = NULL, $option_group_i
  * @param $type
  *   A String containing the field type
  *
- * @return
+ * @return array
  *   An array containing the handler name and any extra settings
  */
 function civicrm_views_get_sort($type) {
@@ -671,33 +630,25 @@ function civicrm_views_get_sort($type) {
     case "Memo":
     case "Float":
     case "Int":
-      return array(
-        'handler' => 'views_handler_sort',
-      );
+      return array('handler' => 'views_handler_sort');
+
     case "Date":
-      return array(
-        'handler' => 'views_handler_sort_date',
-      );
+      return array('handler' => 'views_handler_sort_date');
+
     case "Boolean":
-      return array(
-        'handler' => 'views_handler_sort',
-      );
+      return array('handler' => 'views_handler_sort');
+
     case "StateProvince":
-      return array(
-        'handler' => 'views_handler_sort',
-      );
+      return array('handler' => 'views_handler_sort');
+
     case "Country":
-      return array(
-        'handler' => 'views_handler_sort',
-      );
+      return array('handler' => 'views_handler_sort');
+
     case "County":
-      return array(
-        'handler' => 'views_handler_sort',
-      );
+      return array('handler' => 'views_handler_sort');
+
     default:
-      return array(
-        'handler' => 'views_handler_sort',
-      );
+      return array('handler' => 'views_handler_sort');
   }
 }
 
@@ -707,17 +658,14 @@ function civicrm_views_get_sort($type) {
  * @param $type
  *   A String containing the field type
  *
- * @return
+ * @return array
  *   An array containing the handler name and any extra settings
  */
 function civicrm_views_get_relationship($type) {
   switch ($type) {
     case "ContactReference":
-      return array(
-        'handler'    => 'views_handler_relationship',
-        'base'       => 'civicrm_contact',
-        'base field' => 'id',
-      );
+      return array('handler' => 'views_handler_relationship', 'base' => 'civicrm_contact', 'base field' => 'id');
+
     default:
       return array();
   }
@@ -785,7 +733,7 @@ function civicrm_views_plugins() {
   // Default argument to pull CiviCRM IDs from the URL
   $data['argument default']['civicrm_id'] = array(
     'title' => t('CiviCRM ID from URL'),
-    'handler' => 'civicrm_plugin_argument_default_civicrm_id'
+    'handler' => 'civicrm_plugin_argument_default_civicrm_id',
   );
 
   // Calendar module integration
@@ -793,7 +741,7 @@ function civicrm_views_plugins() {
     $civicrm_module_path = drupal_get_path('module', 'civicrm');
     $data['row'] = array(
       'civicrm_event_calendar' => array(
-      	'title' => t('Calendar Items'),
+        'title' => t('Calendar Items'),
         'help' => t('Displays each selected event as a Calendar item.'),
         'handler' => 'calendar_plugin_row_civicrm',
         'path' => "$civicrm_module_path/modules/views/plugins",
@@ -816,7 +764,7 @@ function civicrm_views_plugins() {
         'dao class' => 'CRM_Activity_DAO_Activity',
         'title field' => 'subject',
       ),
-			'civicrm_case_calendar' => array(
+      'civicrm_case_calendar' => array(
         'title' => t('Case Items'),
         'help' => t('Displays each selected case as a Calendar item.'),
         'handler' => 'calendar_plugin_row_civicrm',
diff --git a/modules/views/civicrm.views_default.inc b/modules/views/civicrm.views_default.inc
index 5440840..345963b 100644
--- a/modules/views/civicrm.views_default.inc
+++ b/modules/views/civicrm.views_default.inc
@@ -21,18 +21,23 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
+
+/**
+ * CiviCRM default views
+ * @return array|null
+ */
 function civicrm_views_default_views() {
   $views = NULL;
 
   if (module_exists('date_views') && module_exists('calendar')) {
-    $view              = new view;
+    $view = new view();
     $view->name = 'civicrm_events';
     $view->description = 'Calendar of CiviCRM Events';
-    $view->tag         = 'civicrm';
-    $view->base_table  = 'civicrm_event';
+    $view->tag = 'civicrm';
+    $view->base_table = 'civicrm_event';
     $view->human_name = 'CiviCRM Events';
-    $view->core        = 7;
+    $view->core = 7;
     $view->api_version = '3.0';
     $view->disabled = TRUE;
 
@@ -575,8 +580,7 @@ function civicrm_views_default_views() {
     $handler->display->display_options['arguments']['id']['default_action'] = 'default';
     $handler->display->display_options['arguments']['id']['exception']['title'] = 'All';
     $handler->display->display_options['arguments']['id']['default_argument_type'] = 'php';
-    $handler->display->display_options['arguments']['id']['default_argument_options']['code'] =
-      '
+    $handler->display->display_options['arguments']['id']['default_argument_options']['code'] = '
         global $user;
 	civicrm_initialize( );
 	$results=civicrm_api("UFMatch","get", array (version => \'3\',\'sequential\' =>\'1\', \'uf_id\' =>$user->uid));
@@ -813,4 +817,3 @@ function civicrm_views_default_views() {
 
   return $views;
 }
-
diff --git a/tests/phpunit/CiviDrupal/HookTest.php b/tests/phpunit/CiviDrupal/HookTest.php
index a9a15f3..2542cf9 100644
--- a/tests/phpunit/CiviDrupal/HookTest.php
+++ b/tests/phpunit/CiviDrupal/HookTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace CiviDrupal {
 
   use Civi\Test\EndToEndInterface;

From 9896b363db9c002a354b55e2cb7232647e1f8867 Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Tue, 29 Aug 2017 06:38:36 +1000
Subject: [PATCH 14/86] Lint Civitheme module

---
 modules/civicrmtheme/civicrmtheme.install | 16 ++++++++--------
 modules/civicrmtheme/civicrmtheme.module  |  7 +++----
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/modules/civicrmtheme/civicrmtheme.install b/modules/civicrmtheme/civicrmtheme.install
index fdb3235..2f8acac 100644
--- a/modules/civicrmtheme/civicrmtheme.install
+++ b/modules/civicrmtheme/civicrmtheme.install
@@ -23,7 +23,7 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  *
@@ -33,8 +33,8 @@
  *
  */
 
-/*
- * Implemenation of hook_enable()
+/**
+ * Implements hook_enable().
  */
 function civicrmtheme_enable() {
   // update module weight to 110, to make it run after system and civicrm
@@ -42,19 +42,19 @@ function civicrmtheme_enable() {
 }
 
 /**
- * Implementation of hook_install().
+ * Implements hook_install().
  */
 function civicrmtheme_install() {
-  $link = l(t('Administer > Appearance > Administration theme'), 'admin/appearance');
-  drupal_set_message(t("CiviCRM theme configuration setting is available under !link", array('!link' => $link)));
+  $t = get_t();
+  $link = l($t('Administer > Appearance > Administration theme'), 'admin/appearance');
+  drupal_set_message($t("CiviCRM theme configuration setting is available under !link", array('!link' => $link)));
 }
 
 /**
- * Implementation of hook_uninstall().
+ * Implements hook_uninstall().
  */
 function civicrmtheme_uninstall() {
   // cleaning variables
   variable_del('civicrmtheme_theme_admin');
   variable_del('civicrmtheme_theme_public');
 }
-
diff --git a/modules/civicrmtheme/civicrmtheme.module b/modules/civicrmtheme/civicrmtheme.module
index 1c0e386..9a5b9b0 100644
--- a/modules/civicrmtheme/civicrmtheme.module
+++ b/modules/civicrmtheme/civicrmtheme.module
@@ -23,7 +23,7 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  *
@@ -53,7 +53,7 @@ function civicrmtheme_list_themes() {
 }
 
 /**
- * Implementation of hook_form_alter().
+ * Implements hook_form_alter().
  */
 function civicrmtheme_form_system_themes_admin_form_alter(&$form, $form_state) {
   // Define a fieldset for civicrm theme setting section
@@ -98,7 +98,7 @@ function civicrmtheme_system_themes_admin_form_submit($form, &$form_state) {
 }
 
 /**
- * Implementation of hook_custom_theme().
+ * Implements hook_custom_theme().
  */
 function civicrmtheme_custom_theme() {
   if (arg(0) != 'civicrm') {
@@ -135,4 +135,3 @@ function civicrmtheme_custom_theme() {
     return $admin_theme;
   }
 }
-

From 2f7d453dc013c394663d69ee47210f3e86d5dca6 Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Tue, 29 Aug 2017 06:38:49 +1000
Subject: [PATCH 15/86] (NFC) Lint civicrm.config.php.drupal

---
 civicrm.config.php.drupal | 139 +++++++++++++++++++-------------------
 1 file changed, 71 insertions(+), 68 deletions(-)

diff --git a/civicrm.config.php.drupal b/civicrm.config.php.drupal
index 2250906..e20590a 100644
--- a/civicrm.config.php.drupal
+++ b/civicrm.config.php.drupal
@@ -32,90 +32,93 @@
  * 10. $confdir/default
  *
  */
-
 function civicrm_conf_init() {
-    global $skipConfigError;
+  global $skipConfigError;
 
-    static $conf = '';
+  static $conf = '';
 
-    if ($conf) {
-        return $conf;
-    }
+  if ($conf) {
+    return $conf;
+  }
 
-    /**
-     * We are within the civicrm module, the drupal root is 2 links
-     * above us, so use that
-     */
-    $currentDir = dirname( __FILE__ ) . DIRECTORY_SEPARATOR;
-    if ( file_exists( $currentDir . 'settings_location.php' ) ) {
-        include $currentDir . 'settings_location.php';
-    }
+  /**
+   * We are within the civicrm module, the drupal root is 2 links
+   * above us, so use that
+   */
+  $currentDir = dirname(__FILE__) . DIRECTORY_SEPARATOR;
+  if (file_exists($currentDir . 'settings_location.php')) {
+    include $currentDir . 'settings_location.php';
+  }
 
-    if ( defined( 'CIVICRM_CONFDIR' ) && ! isset( $confdir ) ) {
-        $confdir = CIVICRM_CONFDIR;
-    } else {
-        // make it relative to civicrm.config.php, else php makes it relative
-        // to the script that invokes it
-        $moduleDir  = 'sites' . DIRECTORY_SEPARATOR . 'all' . DIRECTORY_SEPARATOR . 'modules';
-        $contribDir = $moduleDir . DIRECTORY_SEPARATOR . 'contrib';
-        // check to see if this is under sites/all/modules/contrib or subdir civicrm-core
-        if ( strpos( $currentDir, $contribDir ) !== false || strpos( $currentDir, 'civicrm-core' ) !== false) {
-            $confdir = $currentDir . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..';
-        // check to see if this is under sites/all/modules
-        } else if ( strpos( $currentDir, $moduleDir ) !== false ) {
-            $confdir = $currentDir . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..';
-        } else {
-            $confdir = $currentDir . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR;
-        }
+  if (defined('CIVICRM_CONFDIR') && !isset($confdir)) {
+    $confdir = CIVICRM_CONFDIR;
+  }
+  else {
+    // make it relative to civicrm.config.php, else php makes it relative
+    // to the script that invokes it
+    $moduleDir  = 'sites' . DIRECTORY_SEPARATOR . 'all' . DIRECTORY_SEPARATOR . 'modules';
+    $contribDir = $moduleDir . DIRECTORY_SEPARATOR . 'contrib';
+    // check to see if this is under sites/all/modules/contrib or subdir civicrm-core
+    if (strpos($currentDir, $contribDir) !== FALSE || strpos($currentDir, 'civicrm-core') !== FALSE) {
+      $confdir = $currentDir . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..';
     }
-
-    if ( file_exists( $confdir . DIRECTORY_SEPARATOR . 'civicrm.settings.php' ) ) {
-        return $confdir;
+    // check to see if this is under sites/all/modules
+    elseif (strpos($currentDir, $moduleDir) !== FALSE) {
+      $confdir = $currentDir . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..';
     }
-
-    if ( ! file_exists( $confdir ) && ! $skipConfigError ) {
-        echo "Could not find valid configuration dir, best guess: $confdir<br/><br/>\n";
-        exit( );
+    else {
+      $confdir = $currentDir . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR;
     }
+  }
 
-    // since drupal 7, alias could be defined in sites/sites.php
-    if ( file_exists( $confdir . "/sites.php" ) ) {
-      include $confdir . "/sites.php";
-    } else {
-      $sites = array();
-    }
+  if (file_exists($confdir . DIRECTORY_SEPARATOR . 'civicrm.settings.php')) {
+    return $confdir;
+  }
+
+  if (!file_exists($confdir) && !$skipConfigError) {
+    echo "Could not find valid configuration dir, best guess: $confdir<br/><br/>\n";
+    exit();
+  }
+
+  // since drupal 7, alias could be defined in sites/sites.php
+  if (file_exists($confdir . "/sites.php")) {
+    include $confdir . "/sites.php";
+  }
+  else {
+    $sites = array();
+  }
 
-    $phpSelf  = array_key_exists( 'PHP_SELF' , $_SERVER ) ? $_SERVER['PHP_SELF' ] : '';
-    $httpHost = array_key_exists( 'HTTP_HOST', $_SERVER ) ? $_SERVER['HTTP_HOST'] : '';
+  $phpSelf  = array_key_exists('PHP_SELF', $_SERVER) ? $_SERVER['PHP_SELF'] : '';
+  $httpHost = array_key_exists('HTTP_HOST', $_SERVER) ? $_SERVER['HTTP_HOST'] : '';
 
-    $uri    = explode('/', $phpSelf );
-    $server = explode('.', implode('.', array_reverse(explode(':', rtrim($httpHost, '.')))));
-    for ($i = count($uri) - 1; $i > 0; $i--) {
-        for ($j = count($server); $j > 0; $j--) {
-            $dir = implode('.', array_slice($server, -$j)) . implode('.', array_slice($uri, 0, $i));
-            if (file_exists("$confdir/$dir/civicrm.settings.php")) {
-                $conf = "$confdir/$dir";
-                return $conf;
-            }
-            // check for alias
-            if (isset($sites[$dir]) && file_exists("$confdir/{$sites[$dir]}/civicrm.settings.php")) {
-              $conf = "$confdir/{$sites[$dir]}";
-              return $conf;
-            }
-        }
+  $uri = explode('/', $phpSelf);
+  $server = explode('.', implode('.', array_reverse(explode(':', rtrim($httpHost, '.')))));
+  for ($i = count($uri) - 1; $i > 0; $i--) {
+    for ($j = count($server); $j > 0; $j--) {
+      $dir = implode('.', array_slice($server, -$j)) . implode('.', array_slice($uri, 0, $i));
+      if (file_exists("$confdir/$dir/civicrm.settings.php")) {
+        $conf = "$confdir/$dir";
+        return $conf;
+      }
+      // check for alias
+      if (isset($sites[$dir]) && file_exists("$confdir/{$sites[$dir]}/civicrm.settings.php")) {
+        $conf = "$confdir/{$sites[$dir]}";
+        return $conf;
+      }
     }
+  }
 
-    // FIXME: problem spot for Drupal 5.1 config dir layout
-    $conf = "$confdir/default";
-    return $conf;
+  // FIXME: problem spot for Drupal 5.1 config dir layout
+  $conf = "$confdir/default";
+  return $conf;
 }
 
-$settingsFile = civicrm_conf_init( ) . '/civicrm.settings.php';
+$settingsFile = civicrm_conf_init() . '/civicrm.settings.php';
 define('CIVICRM_SETTINGS_PATH', $settingsFile);
-$error = include_once( $settingsFile );
-if ( $error == false ) {
-    echo "Could not load the settings file at: {$settingsFile}\n";
-    exit( );
+$error = include_once $settingsFile;
+if ($error == FALSE) {
+  echo "Could not load the settings file at: {$settingsFile}\n";
+  exit();
 }
 
 // Load class loader

From 7ce0e0aa1c61f1dde3b7a4d0ca049b7f45f43f30 Mon Sep 17 00:00:00 2001
From: Chris Burgess <chris@giantrobot.co.nz>
Date: Thu, 7 Sep 2017 11:29:38 +1200
Subject: [PATCH 16/86] CiviCRM / Drupal Rules: Show all groups.

CRM-21156
---
 modules/civicrm_rules/civicrm_rules_action.inc |  4 +++-
 modules/civicrm_rules/civicrm_rules_utils.inc  | 10 ++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/modules/civicrm_rules/civicrm_rules_action.inc b/modules/civicrm_rules/civicrm_rules_action.inc
index 05bea5a..bf72dc3 100644
--- a/modules/civicrm_rules/civicrm_rules_action.inc
+++ b/modules/civicrm_rules/civicrm_rules_action.inc
@@ -61,7 +61,9 @@ The content of the email is:
   }
 
   $defaults = array(
-    'parameter' => array('contact' => array('type' => 'contact',
+    'parameter' => array(
+      'contact' => array(
+        'type' => 'contact',
         'label' => t('Contact'),
         'save' => TRUE,
       ),
diff --git a/modules/civicrm_rules/civicrm_rules_utils.inc b/modules/civicrm_rules/civicrm_rules_utils.inc
index e5c1973..9d73510 100644
--- a/modules/civicrm_rules/civicrm_rules_utils.inc
+++ b/modules/civicrm_rules/civicrm_rules_utils.inc
@@ -42,7 +42,13 @@
  */
 function _civicrm_get_groups() {
   civicrm_initialize();
-  $groupInformation = civicrm_api('group', 'get', array('version' => 3));
+  $groupInformation = civicrm_api('group', 'get', array(
+    'version' => 3,
+    'options' => array(
+      'limit' => 0,
+      'sort' => 'title ASC',
+    ),
+  ));
 
   $groups = array();
   foreach ($groupInformation['values'] as $values) {
@@ -91,7 +97,7 @@ function _civicrm_rules_tag_contact($contactId, $tagId, $action = 'create') {
     'entity_id' => $contactId,
     'tag_id' => $tagId,
   );
-  
+
   civicrm_api3('EntityTag', $action, $params);
 }
 

From ffcb8f4925aa310b0405ce36d7d11b828e160c0c Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Tue, 29 Aug 2017 06:59:05 +1000
Subject: [PATCH 17/86] Lint CiviCRM Rules module

---
 .../civicrm_rules.contact-eval.inc            |  3 +-
 .../civicrm_rules.event-eval.inc              |  3 +-
 modules/civicrm_rules/civicrm_rules.install   | 41 +++++++++++++++++++
 .../civicrm_rules.mailing-eval.inc            |  5 +--
 modules/civicrm_rules/civicrm_rules.module    | 22 ++++------
 .../civicrm_rules.participant-eval.inc        | 17 ++++----
 modules/civicrm_rules/civicrm_rules.rules.inc | 11 +++--
 .../civicrm_rules/civicrm_rules_action.inc    | 37 +++++++++++------
 .../civicrm_rules_admin_form.inc              |  1 -
 .../civicrm_rules/civicrm_rules_condition.inc |  9 ++--
 .../civicrm_rules/civicrm_rules_entity.inc    |  3 +-
 modules/civicrm_rules/civicrm_rules_event.inc |  9 ++--
 modules/civicrm_rules/civicrm_rules_utils.inc |  6 +--
 13 files changed, 103 insertions(+), 64 deletions(-)
 create mode 100644 modules/civicrm_rules/civicrm_rules.install

diff --git a/modules/civicrm_rules/civicrm_rules.contact-eval.inc b/modules/civicrm_rules/civicrm_rules.contact-eval.inc
index 1281518..fdf2d02 100644
--- a/modules/civicrm_rules/civicrm_rules.contact-eval.inc
+++ b/modules/civicrm_rules/civicrm_rules.contact-eval.inc
@@ -23,7 +23,7 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  *
@@ -144,4 +144,3 @@ function civicrm_rules_options_list() {
   $settings['groups'] = _civicrm_get_groups();
   return $settings;
 }
-
diff --git a/modules/civicrm_rules/civicrm_rules.event-eval.inc b/modules/civicrm_rules/civicrm_rules.event-eval.inc
index 6ed5e9b..461a101 100644
--- a/modules/civicrm_rules/civicrm_rules.event-eval.inc
+++ b/modules/civicrm_rules/civicrm_rules.event-eval.inc
@@ -23,7 +23,7 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  *
@@ -92,4 +92,3 @@ function civicrm_rules_events_argument_civicrm_event($eventobj) {
 function civicrm_rules_get_event_type_options() {
   return civicrm_rules_get_options('event_type');
 }
-
diff --git a/modules/civicrm_rules/civicrm_rules.install b/modules/civicrm_rules/civicrm_rules.install
new file mode 100644
index 0000000..77396f9
--- /dev/null
+++ b/modules/civicrm_rules/civicrm_rules.install
@@ -0,0 +1,41 @@
+<?php
+/*
+ +--------------------------------------------------------------------+
+ | CiviCRM version 4.7                                                |
+ +--------------------------------------------------------------------+
+ | Copyright CiviCRM LLC (c) 2004-2017                                |
+ +--------------------------------------------------------------------+
+ | 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        |
+ +--------------------------------------------------------------------+
+ */
+
+/**
+ *
+ * @package CRM
+ * @copyright CiviCRM LLC (c) 2004-2017
+ * $Id$
+ *
+ */
+
+/**
+ * Implements hook_enable().
+ */
+function civicrm_rules_enable() {
+  db_query("UPDATE {system} SET weight = 110 WHERE name = 'civicrm_rules'");
+}
diff --git a/modules/civicrm_rules/civicrm_rules.mailing-eval.inc b/modules/civicrm_rules/civicrm_rules.mailing-eval.inc
index 9043b67..e142cf8 100644
--- a/modules/civicrm_rules/civicrm_rules.mailing-eval.inc
+++ b/modules/civicrm_rules/civicrm_rules.mailing-eval.inc
@@ -23,7 +23,7 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  *
@@ -73,7 +73,7 @@ function civicrm_rules_rules_action_mailing_send_email($to,
       $params['toEmail'] = CRM_Utils_Token::replaceMailingTokens($toEmail, $state->variables['mailing'], NULL, $tokens);
 
       //only process user permission tokens if used in toEmail
-      if ( in_array(trim($toEmail, '{}'), $tokens['user']) ) {
+      if (in_array(trim($toEmail, '{}'), $tokens['user'])) {
         //we require a TO email, but can only send one; so we strip the first off and send the rest as CCs
         $userEmails = explode(',', CRM_Utils_Token::replaceUserTokens($params['toEmail'], $tokens));
         $params['toEmail'] = $userEmails[0];
@@ -93,4 +93,3 @@ function civicrm_rules_condition_mailing_approved($mailing, $settings) {
 function civicrm_rules_condition_mailing_rejected($mailing, $settings) {
   return $mailing->approval_status_id != 1;
 }
-
diff --git a/modules/civicrm_rules/civicrm_rules.module b/modules/civicrm_rules/civicrm_rules.module
index cf3d09f..2c5c346 100644
--- a/modules/civicrm_rules/civicrm_rules.module
+++ b/modules/civicrm_rules/civicrm_rules.module
@@ -23,7 +23,7 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  *
@@ -33,13 +33,6 @@
  *
  */
 
-/*
- * Implemenation of hook_enable()
- */
-function civicrm_rules_enable() {
-  db_query("UPDATE {system} SET weight = 110 WHERE name = 'civicrm_rules'");
-}
-
 /**
  * Implement the post hook and fire the corresponding rules event
  */
@@ -60,7 +53,7 @@ function civicrm_rules_civicrm_post($op, $objectName, $objectId, &$objectRef) {
     array('contact' => 'contact')
   );
 
-  if (!in_array(strtolower($objectName), $validObjects, true)) {
+  if (!in_array(strtolower($objectName), $validObjects, TRUE)) {
     return;
   }
 
@@ -193,12 +186,12 @@ FROM   civicrm_mailing
   }
 }
 /**
- * Implementation of hook_permission().
+ * Implements hook_permission().
  */
 function civicrm_rules_permission() {
   return array(
-    'access civicrm rules settings' =>
-    array('title' => t('Access CiviCRM Rules Settings'),
+    'access civicrm rules settings' => array(
+      'title' => t('Access CiviCRM Rules Settings'),
       'description' => t('Access CiviCRM Rules Settings.'),
     ),
   );
@@ -207,8 +200,8 @@ function civicrm_rules_permission() {
 function civicrm_rules_menu() {
 
   $items['admin/config/civicrm/rules'] = array(
-    'title' => t('CiviCRM Rules settings'),
-    'description' => t('CiviCRM Rules Configuration'),
+    'title' => 'CiviCRM Rules settings',
+    'description' => 'CiviCRM Rules Configuration',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('civicrm_rules_admin_settings'),
     'access arguments' => array('access civicrm rules settings'),
@@ -217,4 +210,3 @@ function civicrm_rules_menu() {
   );
   return $items;
 }
-
diff --git a/modules/civicrm_rules/civicrm_rules.participant-eval.inc b/modules/civicrm_rules/civicrm_rules.participant-eval.inc
index abe6ea0..c78df63 100644
--- a/modules/civicrm_rules/civicrm_rules.participant-eval.inc
+++ b/modules/civicrm_rules/civicrm_rules.participant-eval.inc
@@ -23,7 +23,7 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  *
@@ -52,10 +52,10 @@ function civicrm_rules_condition_participant_role($entityobj, $roleIDs) {
   return TRUE;
 }
 
-/*
- *get node related via cck  - this relies on there being a field called civicrm_event.
- *If you use this field on more than one event type it will load the last one (not something you should do)
- *I wanted to do it using a civicrm_event cck type but got a bit stuck.
+/**
+ * get node related via cck  - this relies on there being a field called civicrm_event.
+ * If you use this field on more than one event type it will load the last one (not something you should do)
+ * I wanted to do it using a civicrm_event cck type but got a bit stuck.
  */
 function civicrm_rules_events_argument_civicrm_eventnode($participantobj) {
   if (!module_exists('field') || !isset($participantobj['participant'])) {
@@ -66,15 +66,15 @@ function civicrm_rules_events_argument_civicrm_eventnode($participantobj) {
   $eventID = $participant->event_id;
   $results = db_select('field_config_instance', 'i')
     ->fields('i', array('field_name', 'entity_type', 'bundle'))
-    ->condition('field_name',  '%'.db_like('civicrm_event'), 'LIKE')
+    ->condition('field_name', '%' . db_like('civicrm_event'), 'LIKE')
     ->execute()
     ->fetchAllAssoc('id');
-  foreach($results as $result) {
+  foreach ($results as $result) {
     $nid = db_select('field_data_' . $result->field_name, 'fd')
       ->fields('fd', array('entity_id'))
       ->condition('bundle', $result->bundle, '=')
       ->condition($result->field_name . '_value', $eventID, '=')
-      ->condition('entity_type',  $result->entity_type, '=')
+      ->condition('entity_type', $result->entity_type, '=')
       ->execute()
       ->fetchAssoc();
     return $nid['entity_id'];
@@ -94,4 +94,3 @@ function civicrm_rules_events_argument_civicrm_contactID_load_user($entityobj) {
   }
   return NULL;
 }
-
diff --git a/modules/civicrm_rules/civicrm_rules.rules.inc b/modules/civicrm_rules/civicrm_rules.rules.inc
index 1e3e31e..190d9f3 100644
--- a/modules/civicrm_rules/civicrm_rules.rules.inc
+++ b/modules/civicrm_rules/civicrm_rules.rules.inc
@@ -23,7 +23,7 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  *
@@ -39,7 +39,7 @@ require_once 'civicrm_rules.event-eval.inc';
 require_once 'civicrm_rules.participant-eval.inc';
 
 /**
- * Implements hook_rules_file_info() on behalf of the user module.
+ * Implements hook_rules_file_info().
  */
 function civicrm_rules_rules_file_info() {
   return array(
@@ -51,7 +51,7 @@ function civicrm_rules_rules_file_info() {
 }
 
 /**
- * Implementation of hook_rules_event_info().
+ * Implements hook_rules_event_info().
  */
 function civicrm_rules_rules_event_info() {
   require_once 'civicrm_rules_event.inc';
@@ -80,7 +80,7 @@ function civicrm_rules_rules_admin_access() {
 }
 
 /**
- * Implementation of hook_rules_action_info().
+ * Implements hook_rules_action_info().
  */
 function civicrm_rules_rules_action_info() {
   require_once 'civicrm_rules_action.inc';
@@ -88,10 +88,9 @@ function civicrm_rules_rules_action_info() {
 }
 
 /**
- * Implementation of hook_rules_data_type_info().
+ * Implements hook_rules_data_type_info().
  */
 function civicrm_rules_rules_data_info() {
   require_once 'civicrm_rules_entity.inc';
   return civicrm_rules_get_entity();
 }
-
diff --git a/modules/civicrm_rules/civicrm_rules_action.inc b/modules/civicrm_rules/civicrm_rules_action.inc
index bf72dc3..f719074 100644
--- a/modules/civicrm_rules/civicrm_rules_action.inc
+++ b/modules/civicrm_rules/civicrm_rules_action.inc
@@ -23,7 +23,7 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  *
@@ -34,7 +34,7 @@
  */
 
 /**
- * Implementation of hook_rules_action_info().
+ * Implements hook_rules_action_info().
  */
 function civicrm_rules_get_action() {
   civicrm_initialize();
@@ -77,15 +77,19 @@ The content of the email is:
     'access callback' => 'civicrm_rules_rules_admin_access',
   );
 
-  $items['add_to_group'] = $defaults + array('label' => t('Add Contact to CiviCRM Group'),
+  $items['add_to_group'] = $defaults + array(
+    'label' => t('Add Contact to CiviCRM Group'),
     'base' => 'civicrm_rules_rules_action_add_to_group',
   );
-  $items['remove_from_group'] = $defaults + array('label' => t('Remove Contact from CiviCRM Group'),
+  $items['remove_from_group'] = $defaults + array(
+    'label' => t('Remove Contact from CiviCRM Group'),
     'base' => 'civicrm_rules_rules_action_remove_from_group',
   );
 
   $defaults = array(
-    'parameter' => array('contact' => array('type' => 'contact',
+    'parameter' => array(
+      'contact' => array(
+        'type' => 'contact',
         'label' => t('Contact'),
         'save' => TRUE,
       ),
@@ -99,15 +103,19 @@ The content of the email is:
     'access callback' => 'civicrm_rules_rules_admin_access',
   );
 
-  $items['add_tag'] = $defaults + array('label' => t('Add CiviCRM Tag to Contact'),
+  $items['add_tag'] = $defaults + array(
+    'label' => t('Add CiviCRM Tag to Contact'),
     'base' => 'civicrm_rules_rules_action_add_tag',
   );
-  $items['remove_tag'] = $defaults + array('label' => t('Remove CiviCRM Tag from Contact'),
+  $items['remove_tag'] = $defaults + array(
+    'label' => t('Remove CiviCRM Tag from Contact'),
     'base' => 'civicrm_rules_rules_action_remove_tag',
   );
 
-$defaults = array(
-    'parameter' => array('to' => array('type' => 'text',
+  $defaults = array(
+    'parameter' => array(
+      'to' => array(
+        'type' => 'text',
         'label' => t('To'),
         'description' => t('The e-mail address or addresses where the message will be sent to. The formatting of this string must comply with RFC 2822.'),
       ),
@@ -132,12 +140,15 @@ $defaults = array(
     'access callback' => 'civicrm_rules_rules_admin_access',
   );
 
-  $items['contact_send_email'] = $defaults + array('label' => t('Send Email'),
+  $items['contact_send_email'] = $defaults + array(
+    'label' => t('Send Email'),
     'base' => 'civicrm_rules_rules_action_contact_send_email',
   );
 
   $defaults = array(
-    'parameter' => array('to' => array('type' => 'text',
+    'parameter' => array(
+      'to' => array(
+        'type' => 'text',
         'label' => t('To'),
         'description' => t('The e-mail address or addresses where the message will be sent to. The formatting of this string must comply with RFC 2822.'),
       ),
@@ -164,9 +175,9 @@ $defaults = array(
     'group' => t('CiviCRM Mailing'),
   );
 
-  $items['mailing_send_email'] = $defaults + array('label' => t('Send Email'),
+  $items['mailing_send_email'] = $defaults + array(
+    'label' => t('Send Email'),
     'base' => 'civicrm_rules_rules_action_mailing_send_email',
   );
   return $items;
 }
-
diff --git a/modules/civicrm_rules/civicrm_rules_admin_form.inc b/modules/civicrm_rules/civicrm_rules_admin_form.inc
index 8370a2f..5a91b57 100644
--- a/modules/civicrm_rules/civicrm_rules_admin_form.inc
+++ b/modules/civicrm_rules/civicrm_rules_admin_form.inc
@@ -17,4 +17,3 @@ function _civicrm_rules_admin_getEntities() {
   // to extend entities to all API entities
   return array('event' => 'Event', 'participant' => 'Participant');
 }
-
diff --git a/modules/civicrm_rules/civicrm_rules_condition.inc b/modules/civicrm_rules/civicrm_rules_condition.inc
index 3e44e65..543053b 100644
--- a/modules/civicrm_rules/civicrm_rules_condition.inc
+++ b/modules/civicrm_rules/civicrm_rules_condition.inc
@@ -23,7 +23,7 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  *
@@ -81,7 +81,8 @@ function civicrm_rules_condition_parameter($label, $type = 'contact') {
 
   if ($type == 'participant') {
     return $default + array(
-      'civicrm_participant_role' => array('type' => 'list<integer>',
+      'civicrm_participant_role' => array(
+        'type' => 'list<integer>',
         'label' => t('Participant role'),
         'options list' => 'civicrm_rules_get_participant_role_options',
       ));
@@ -89,7 +90,8 @@ function civicrm_rules_condition_parameter($label, $type = 'contact') {
 
   if ($type == 'event') {
     return $default + array(
-      'civicrm_event_type' => array('type' => 'list<integer>',
+      'civicrm_event_type' => array(
+        'type' => 'list<integer>',
         'label' => t('CiviCRM event type'),
         'options list' => 'civicrm_rules_get_event_type_options',
       ));
@@ -97,4 +99,3 @@ function civicrm_rules_condition_parameter($label, $type = 'contact') {
 
   return $default;
 }
-
diff --git a/modules/civicrm_rules/civicrm_rules_entity.inc b/modules/civicrm_rules/civicrm_rules_entity.inc
index 91cba2c..23b9033 100644
--- a/modules/civicrm_rules/civicrm_rules_entity.inc
+++ b/modules/civicrm_rules/civicrm_rules_entity.inc
@@ -23,7 +23,7 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  *
@@ -61,4 +61,3 @@ function civicrm_rules_get_entity() {
     ),
   );
 }
-
diff --git a/modules/civicrm_rules/civicrm_rules_event.inc b/modules/civicrm_rules/civicrm_rules_event.inc
index 8b27127..33a3c5a 100644
--- a/modules/civicrm_rules/civicrm_rules_event.inc
+++ b/modules/civicrm_rules/civicrm_rules_event.inc
@@ -23,7 +23,7 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  *
@@ -153,9 +153,11 @@ function civicrm_rules_get_event() {
 function civicrm_rules_rules_events_variables($label, $type = 'contact') {
 
   $default = array(
-    $type => array('type' => $type,
+    $type => array(
+      'type' => $type,
       'label' => $label,
-    ));
+    ),
+  );
 
   if ($type == 'event') {
     return $default + array(
@@ -185,4 +187,3 @@ function civicrm_rules_rules_events_variables($label, $type = 'contact') {
 
   return $default;
 }
-
diff --git a/modules/civicrm_rules/civicrm_rules_utils.inc b/modules/civicrm_rules/civicrm_rules_utils.inc
index 9d73510..e5135a3 100644
--- a/modules/civicrm_rules/civicrm_rules_utils.inc
+++ b/modules/civicrm_rules/civicrm_rules_utils.inc
@@ -23,7 +23,7 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  *
@@ -77,7 +77,7 @@ function _civicrm_rules_group_contact($contactId, $groupId, $action = 'create')
  */
 function _civicrm_get_tags() {
   civicrm_initialize();
-  $tagInformation = civicrm_api3('Tag', 'get', array('options' => array('limit' => 0),));
+  $tagInformation = civicrm_api3('Tag', 'get', array('options' => array('limit' => 0)));
 
   $tags = array();
   foreach ($tagInformation['values'] as $values) {
@@ -137,7 +137,7 @@ function _civicrm_rules_load_mailing($mailingID) {
 }
 
 
-/*
+/**
  * function to return labels for checkboxes & stuff
  */
 function civicrm_rules_get_options($type) {

From df9c6c98d15f1838553bf30db11b0048b2bd6799 Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Fri, 15 Sep 2017 09:20:09 +1000
Subject: [PATCH 18/86] NFC Civilint civicrm_group_roles module

---
 .../civicrm_group_roles.install               | 21 ++---
 .../civicrm_group_roles.module                | 90 ++++++++++---------
 2 files changed, 56 insertions(+), 55 deletions(-)

diff --git a/modules/civicrm_group_roles/civicrm_group_roles.install b/modules/civicrm_group_roles/civicrm_group_roles.install
index 357db9b..e6702d9 100644
--- a/modules/civicrm_group_roles/civicrm_group_roles.install
+++ b/modules/civicrm_group_roles/civicrm_group_roles.install
@@ -21,7 +21,7 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 // $Id: civicrm_group_roles.module,v 1.1.4.2 2008/10/14 00:20:36 matt2000 Exp $
 
@@ -31,23 +31,23 @@
  */
 
 /**
- * Implementation of hook_install().
+ * Implements hook_install().
  */
 function civicrm_group_roles_install() {
-
-  $here = l(t('here'), 'admin/config/civicrm/civicrm_group_roles/add_rule');
-  drupal_set_message(t('CiviGroup Roles Sync installed. You will need to specify sync rules !1.', array('!1' => $here)));
+  $t = get_t();
+  $here = l($t('here'), 'admin/config/civicrm/civicrm_group_roles/add_rule');
+  drupal_set_message($t('CiviGroup Roles Sync installed. You will need to specify sync rules !1.', array('!1' => $here)));
 }
 
 /**
- * Implementation of hook_enable().
+ * Implements hook_enable().
  */
 function civicrm_group_roles_enable() {
   db_query("UPDATE {system} SET weight = 110 WHERE name = 'civicrm_group_roles'");
 }
 
 /**
- * Implementation of hook_schema().
+ * Implements hook_schema().
  */
 function civicrm_group_roles_schema() {
   $schema['civicrm_group_roles_rules'] = array(
@@ -73,14 +73,9 @@ function civicrm_group_roles_schema() {
   return $schema;
 }
 
-/**
- * Implementation of hook_uninstall().
- */
-function civicrm_group_roles_uninstall() {}
-
 /**
  * Update CiviGroup Roles Sync module weight to be greater than CiviCRM's.
  */
 function civicrm_group_roles_update_7400(&$sandbox) {
-    db_query("UPDATE {system} SET weight = 101 WHERE name = 'civicrm_group_roles'");
+  db_query("UPDATE {system} SET weight = 101 WHERE name = 'civicrm_group_roles'");
 }
diff --git a/modules/civicrm_group_roles/civicrm_group_roles.module b/modules/civicrm_group_roles/civicrm_group_roles.module
index 5fbe588..b5e9e32 100644
--- a/modules/civicrm_group_roles/civicrm_group_roles.module
+++ b/modules/civicrm_group_roles/civicrm_group_roles.module
@@ -21,7 +21,7 @@
   | GNU Affero General Public License or the licensing of CiviCRM,     |
   | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
   +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  * @file
@@ -118,15 +118,13 @@ function civicrm_group_roles_add_groups_oncreate($account, $roles) {
 
 /**
  * Implements hook_form_alter().
+ *
  * The updates CiviCRM when Drupal roles are changed
  */
 function civicrm_group_roles_form_alter(&$form, &$form_state, $form_id) {
   // append this to change user edit submit function
-  if ( ( $form['#id'] == 'user-profile-form' &&
-      isset( $form['#user'] ) &&
-      (module_exists('content_profile') || isset( $form['account'] )) ) ||
-    $form['#id'] == 'user-edit-form'
-  ) {
+  if (($form['#id'] == 'user-profile-form' && isset($form['#user']) && (module_exists('content_profile') ||
+    isset($form['account']))) || $form['#id'] == 'user-edit-form') {
     $uid = $form['#user']->uid;
     if (!$uid) {
       return;
@@ -172,6 +170,7 @@ function _civicrm_group_update($form, $form_values) {
 
 /**
  * Implements hook_civicrm_post().
+ *
  * This provides sync from CiviCRM -> Drupal
  */
 function civicrm_group_roles_civicrm_post($op, $objectName, $objectId, &$objectRef) {
@@ -193,7 +192,7 @@ function civicrm_group_roles_civicrm_post($op, $objectName, $objectId, &$objectR
     $rid = $groupRole->role_id;
     // we need this to properly save the user account below.
     $role_name = db_select('role', 'r')->range(0, 1)->fields('r', array('name'))->condition('rid', $rid)->execute()->fetchField();
-    foreach ($objectRef AS $contact_id) {
+    foreach ($objectRef as $contact_id) {
       if (isset($rolesProcessed[$rid])) {
         continue;
       }
@@ -213,25 +212,26 @@ function civicrm_group_roles_civicrm_post($op, $objectName, $objectId, &$objectR
           civicrm_group_roles_add_role($uid, $rid, $role_name);
           break;
 
-          // "edit" denotes both rejoining or being deleted from a group,
-          // need to check which to perform appropriate action
+        // "edit" denotes both rejoining or being deleted from a group,
+        // need to check which to perform appropriate action
         case 'edit':
           $rolesProcessed[$rid] = $rid;
           // Ideally would use GroupContact API with group_id as a parameter, currently broken (amend once bug fixed):
           // http://issues.civicrm.org/jira/browse/CRM-10331?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
           $contact_groups = civicrm_api('GroupContact', 'get', array(version => '3', 'contact_id' => $contact_id));
           $in_group = FALSE;
-          foreach ($contact_groups['values'] as $group_row){
-            if ($group_row['group_id'] == $group_id){
+          foreach ($contact_groups['values'] as $group_row) {
+            if ($group_row['group_id'] == $group_id) {
               $in_group = TRUE;
               break;
             }
           }
 
-          if ($in_group){
+          if ($in_group) {
             // Contact rejoined the group; add to corresponding role
             civicrm_group_roles_add_role($uid, $rid, $role_name);
-          } else {
+          }
+          else {
             // Contact no longer belongs to group, remove corresponding role,
             // but only if the contact is in no other groups that grant this role
             if (!civicrm_role_granted_by_other_group($contact_id, $rid, $group_id)) {
@@ -264,7 +264,7 @@ function civicrm_group_roles_civicrm_post($op, $objectName, $objectId, &$objectR
  * @param int $rid The debug_backtrace role id being added
  */
 function civicrm_group_roles_add_role($uid, $rid, $role_name) {
-  $account = user_load((int)$uid, TRUE);
+  $account = user_load((int) $uid, TRUE);
 
   // Skip adding the role to the user if they already have it.
   if ($account !== FALSE && !isset($account->roles[$rid])) {
@@ -281,7 +281,7 @@ function civicrm_group_roles_add_role($uid, $rid, $role_name) {
  * @param $rid The role id being removd
  */
 function civicrm_group_roles_del_role($uid, $rid, $role_name) {
-  $account = user_load((int)$uid);
+  $account = user_load((int) $uid);
   // Skip removing the role from the user if they already don't have it.
   if ($account !== FALSE && isset($account->roles[$rid])) {
     $roles = array_diff($account->roles, array($rid => $role_name));
@@ -330,22 +330,22 @@ function civicrm_role_granted_by_other_group($contact_id, $rid, $group_id) {
 function civicrm_group_roles_menu() {
   $items = array();
   $items['admin/config/civicrm/civicrm_group_roles'] = array(
-    'title' => t('CiviGroup Roles Sync'),
-    'description' => t('Add/remove association rules and configure settings. Also perform manual synchronization.'),
+    'title' => 'CiviGroup Roles Sync',
+    'description' => 'Add/remove association rules and configure settings. Also perform manual synchronization.',
     'page callback' => 'civicrm_group_roles_show_rules',
     'access callback' => 'user_access',
     'access arguments' => array('access civicrm group role setting'),
     'type' => MENU_NORMAL_ITEM,
   );
   $items['admin/config/civicrm/civicrm_group_roles/show_rules'] = array(
-    'title' => t('Association rules'),
+    'title' => 'Association rules',
     'access callback' => 'user_access',
     'access arguments' => array('access civicrm group role setting'),
     'weight' => -5,
     'type' => MENU_DEFAULT_LOCAL_TASK,
   );
   $items['admin/config/civicrm/civicrm_group_roles/add_rule'] = array(
-    'title' => t('Add association rule'),
+    'title' => 'Add association rule',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('civicrm_group_roles_add_rule_form'),
     'access callback' => 'user_access',
@@ -353,14 +353,14 @@ function civicrm_group_roles_menu() {
     'type' => MENU_LOCAL_ACTION,
   );
   $items['admin/config/civicrm/civicrm_group_roles/add_rule/%rule_id'] = array(
-    'title' => t('Edit association rule'),
+    'title' => 'Edit association rule',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('civicrm_group_roles_add_rule_form', 1),
     'access callback' => 'user_access',
     'access arguments' => array('access civicrm group role setting'),
   );
   $items['admin/config/civicrm/civicrm_group_roles/manual_sync'] = array(
-    'title' => t('Manually synchronize'),
+    'title' => 'Manually synchronize',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('civicrm_group_roles_manual_sync'),
     'access callback' => 'user_access',
@@ -368,7 +368,7 @@ function civicrm_group_roles_menu() {
     'type' => MENU_LOCAL_TASK,
   );
   $items['admin/config/civicrm/civicrm_group_roles/settings'] = array(
-    'title' => t('Settings'),
+    'title' => 'Settings',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('civicrm_group_roles_settings'),
     'access callback' => 'user_access',
@@ -383,8 +383,8 @@ function civicrm_group_roles_menu() {
  */
 function civicrm_group_roles_permission() {
   return array(
-    'access civicrm group role setting' =>
-    array('title' => t('Access CiviCRM group role setting'),
+    'access civicrm group role setting' => array(
+      'title' => t('Access CiviCRM group role setting'),
       'description' => t('Access Civicrm group roles synchronization.'),
     ),
   );
@@ -420,7 +420,7 @@ function civicrm_group_roles_show_rules($action = NULL, $id = NULL) {
   $groups = CRM_Utils_Array::value('values', $groups);
 
   //Begin building main output table.
-  $header = array('rid' => t('Rule ID'), 'name' => t('Rule Name (\'CiviCRM Group\' <--> \'Drupal Role\')'), 'op' => t('Operations'));
+  $header = array('rid' => t('Rule ID'), 'name' => t("Rule Name ('CiviCRM Group' <--> 'Drupal Role')"), 'op' => t('Operations'));
   $data = array();
 
   $rules = db_query('SELECT * FROM {civicrm_group_roles_rules} ORDER BY id ASC')->fetchAll();
@@ -516,7 +516,9 @@ function civicrm_group_roles_add_rule_form($form, $form_state = array(), $edit_i
 }
 
 /**
- * Implements hook_validate() for the add/edit rule form.
+ * Implements hook_validate().
+ *
+ * for the add/edit rule form.
  */
 function civicrm_group_roles_add_rule_form_validate($form, &$form_state) {
 
@@ -537,7 +539,9 @@ function civicrm_group_roles_add_rule_form_validate($form, &$form_state) {
 }
 
 /**
- * Implements hook_submit() for the add/edit rule form.
+ * Implements hook_submit().
+ *
+ * For the add/edit rule form.
  */
 function civicrm_group_roles_add_rule_form_submit($form, &$form_state) {
   if (!civicrm_initialize()) {
@@ -549,7 +553,7 @@ function civicrm_group_roles_add_rule_form_submit($form, &$form_state) {
     $edit_rule = db_update('civicrm_group_roles_rules')->fields(array(
                    'role_id' => (int) $form_state['values']['add_rule']['select_role'],
                    'group_id' => (int) $form_state['values']['add_rule']['select_group'],
-                 ))->condition('id', (int)$form_state['values']['edit_flag'])->execute();
+                 ))->condition('id', (int) $form_state['values']['edit_flag'])->execute();
 
     if ($edit_rule) {
       drupal_set_message(t('Your association rule has been edited.'));
@@ -557,8 +561,8 @@ function civicrm_group_roles_add_rule_form_submit($form, &$form_state) {
   }
   else {
     $add_rule = db_insert('civicrm_group_roles_rules')->fields(array(
-                  'role_id' => (int)$form_state['values']['add_rule']['select_role'],
-                  'group_id' => (int)$form_state['values']['add_rule']['select_group'],
+                  'role_id' => (int) $form_state['values']['add_rule']['select_role'],
+                  'group_id' => (int) $form_state['values']['add_rule']['select_group'],
                 ))->execute();
 
     if ($add_rule) {
@@ -602,7 +606,7 @@ function civicrm_group_roles_add_remove_groups($roles, $user, $op) {
       'version' => 3,
       'sequential' => 1,
       'return' => 'contact_id',
-      'uf_id' => $user->uid
+      'uf_id' => $user->uid,
     );
     $contact = civicrm_api('UFMatch', 'get', $params);
 
@@ -613,7 +617,7 @@ function civicrm_group_roles_add_remove_groups($roles, $user, $op) {
       foreach ($roles as $rid => $role) {
 
         // Find the group(s) for the role
-        $result = db_select('civicrm_group_roles_rules', 'cgr' )->fields( 'cgr', array('group_id') )->condition('role_id', $rid)->execute( )->fetchAll( );
+        $result = db_select('civicrm_group_roles_rules', 'cgr')->fields('cgr', array('group_id'))->condition('role_id', $rid)->execute()->fetchAll();
         $groups = _civicrm_group_roles_validate_groups($result);
         foreach ($groups as $group) {
           //add the contact
@@ -629,9 +633,11 @@ function civicrm_group_roles_add_remove_groups($roles, $user, $op) {
             $msg = 'Error: Unable to sync role @role';
             $variables = array('@role' => $role);
             watchdog('civicrm_group_roles', $msg, $variables, WATCHDOG_ERROR);
-            if ( $debug_mode ) drupal_set_message( t( 'Error: Unable to sync role %role', array( '%role' => $role ) ) );
+            if ($debug_mode) {
+              drupal_set_message(t('Error: Unable to sync role %role', array('%role' => $role)));
+            }
           }
-          elseif ( $debug_mode && $result['values'][$txt] > 0 ) {
+          elseif ($debug_mode && $result['values'][$txt] > 0) {
             drupal_set_message("$txt user $user->name Group: $role");
             drupal_set_message(var_export($result, TRUE));
           }
@@ -645,11 +651,9 @@ function civicrm_group_roles_add_remove_groups($roles, $user, $op) {
     } //end if contact_id
 
     else {
-      $msg = 'CiviCRM contact not found for Drupal user ID @id';
-      $variables = array('@id' => $user->uid);
       watchdog('civicrm_group_roles', $msg, $variables, WATCHDOG_ERROR);
       if ($debug_mode) {
-        drupal_set_message(t($msg, $variables));
+        drupal_set_message(t('CiviCRM contact not found for Drupal user ID @id', array('@id' => $user->uid)));
       }
     }
 
@@ -668,7 +672,7 @@ function civicrm_group_roles_manual_sync() {
   $form['manual_sync'] = array(
     '#type' => 'fieldset',
     '#title' => t('Manual Synchronization'),
-    '#description' => t('Manually synchronize CiviCRM group membership and Drupal roles according to the current association rules. This process may take a long time.')
+    '#description' => t('Manually synchronize CiviCRM group membership and Drupal roles according to the current association rules. This process may take a long time.'),
   );
   $form['manual_sync']['manual_sync_submit'] = array(
     '#type' => 'submit',
@@ -679,7 +683,9 @@ function civicrm_group_roles_manual_sync() {
 }
 
 /**
- * Implements hook_submit() for the manual sync form.
+ * Implements hook_submit().
+ *
+ * Dor the manual sync form.
  */
 function civicrm_group_roles_manual_sync_submit($form, &$form_state) {
   if (!civicrm_initialize()) {
@@ -701,7 +707,7 @@ function civicrm_group_roles_batch_init() {
     'progress_message' => t('Processed @current out of @total.'),
     'error_message' => t('An error occurred during processing'),
     'finished' => 'civicrm_group_roles_batch_finished',
-    'progressive' => FALSE
+    'progressive' => FALSE,
   );
 
   // Find all existing users
@@ -725,11 +731,11 @@ function civicrm_group_roles_batch_worker($uid, &$context) {
 
   if ($account !== FALSE) {
 
-    $roles = array_diff_key( $account->roles, array( 1 => 'anonymous user', 2 => 'authenticated user' ) );
+    $roles = array_diff_key($account->roles, array(1 => 'anonymous user', 2 => 'authenticated user'));
 
     // Add user to groups
     if ($roles) {
-      civicrm_group_roles_add_remove_groups ( $roles, $account, 'add' );
+      civicrm_group_roles_add_remove_groups($roles, $account, 'add');
     }
 
     // Add roles to user

From da4df6a965aca724a9fb775159c79541948adfc0 Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Fri, 15 Sep 2017 09:36:57 +1000
Subject: [PATCH 19/86] NFC Civilint civicrm_member_roles

---
 .../civicrm_member_roles.drush.inc            |  9 +--
 .../civicrm_member_roles.install              | 14 ++--
 .../civicrm_member_roles.module               | 71 +++++++++++--------
 3 files changed, 50 insertions(+), 44 deletions(-)

diff --git a/modules/civicrm_member_roles/civicrm_member_roles.drush.inc b/modules/civicrm_member_roles/civicrm_member_roles.drush.inc
index 6cd3e93..a8f96ae 100644
--- a/modules/civicrm_member_roles/civicrm_member_roles.drush.inc
+++ b/modules/civicrm_member_roles/civicrm_member_roles.drush.inc
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Implementation of hook_drush_command().
+ * Implements hook_drush_command().
  *
  * In this hook, you specify which commands your
  * drush module makes available, what it does and
@@ -12,16 +12,13 @@
  *
  * @See drush_parse_command() for a list of recognized keys.
  *
- * @return
- *   An associative array describing your command(s).
  */
 function civicrm_member_roles_drush_command() {
   $items = array();
   // the key in the $items array is the name of the command.
   $items['civicrm-member-role-sync'] = array(
     'description' => 'Run CiviCRM Member Role Sync',
-    'examples' =>
-    array(
+    'examples' => array(
       'drush civicrm-member-role-sync --uid=8',
       'drush civicrm-member-role-sync --contact_id=89',
     ),
@@ -40,4 +37,4 @@ function civicrm_member_roles_drush_command() {
  */
 function drush_civicrm_member_roles_civicrm_member_role_sync($uid = NULL, $contact_id = NULL) {
   return _civicrm_member_roles_sync(drush_get_option('uid'), drush_get_option('contact_id'));
-}
\ No newline at end of file
+}
diff --git a/modules/civicrm_member_roles/civicrm_member_roles.install b/modules/civicrm_member_roles/civicrm_member_roles.install
index 7d825ed..61f8d86 100644
--- a/modules/civicrm_member_roles/civicrm_member_roles.install
+++ b/modules/civicrm_member_roles/civicrm_member_roles.install
@@ -11,19 +11,14 @@
  */
 
 /**
- * Implementation of hook_install().
- */
-function civicrm_member_roles_install() {}
-
-/*
- * Implemenation of hook_enable()
+ * Implements hook_enable().
  */
 function civicrm_member_roles_enable() {
   db_query("UPDATE {system} SET weight = 110 WHERE name = 'civicrm_member_roles'");
 }
 
 /**
- * Implementation of hook_schema().
+ * Implements hook_schema().
  */
 function civicrm_member_roles_schema() {
   $schema['civicrm_member_roles_rules'] = array(
@@ -54,7 +49,7 @@ function civicrm_member_roles_schema() {
 }
 
 /**
- * Implementation of hook_uninstall().
+ * Implements hook_uninstall().
  */
 function civicrm_member_roles_uninstall() {
   variable_del('civicrm_member_roles_sync_method');
@@ -73,12 +68,15 @@ function civicrm_member_roles_update_7400() {
       case '0':
         variable_set('civicrm_member_roles_sync_method', array('login'));
         break;
+
       case '1':
         variable_set('civicrm_member_roles_sync_method', array('cron'));
         break;
+
       case '2':
         variable_set('civicrm_member_roles_sync_method', array());
         break;
+
       case '3':
         variable_set('civicrm_member_roles_sync_method', array('update'));
         break;
diff --git a/modules/civicrm_member_roles/civicrm_member_roles.module b/modules/civicrm_member_roles/civicrm_member_roles.module
index 299e623..ff16502 100644
--- a/modules/civicrm_member_roles/civicrm_member_roles.module
+++ b/modules/civicrm_member_roles/civicrm_member_roles.module
@@ -11,7 +11,7 @@
  */
 
 /**
- * Implementation of hook_menu().
+ * Implements hook_menu().
  */
 function civicrm_member_roles_menu() {
   if (!civicrm_initialize()) {
@@ -19,8 +19,8 @@ function civicrm_member_roles_menu() {
   }
   $items = array();
   $items['admin/config/civicrm/civicrm_member_roles'] = array(
-    'title' => t('CiviMember Roles Sync'),
-    'description' => t('Add/remove association rules and configure settings. Also perform manual synchronization.'),
+    'title' => 'CiviMember Roles Sync',
+    'description' => 'Add/remove association rules and configure settings. Also perform manual synchronization.',
     'page callback' => 'civicrm_member_roles_show_rules',
     'access callback' => 'user_access',
     'access arguments' => array('access civicrm member role setting'),
@@ -28,7 +28,7 @@ function civicrm_member_roles_menu() {
   );
 
   $items['admin/config/civicrm/civicrm_member_roles/show_rules'] = array(
-    'title' => t('List Association Rule(s)'),
+    'title' => 'List Association Rule(s)',
     'access callback' => 'user_access',
     'access arguments' => array('access civicrm member role setting'),
     'weight' => -5,
@@ -36,7 +36,7 @@ function civicrm_member_roles_menu() {
   );
 
   $items['admin/config/civicrm/civicrm_member_roles/add_rule'] = array(
-    'title' => t('Add Association Rule'),
+    'title' => 'Add Association Rule',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('civicrm_member_roles_add_rule_form'),
     'access callback' => 'user_access',
@@ -45,7 +45,7 @@ function civicrm_member_roles_menu() {
   );
 
   $items['admin/config/civicrm/civicrm_member_roles/add_rule/%rule_id'] = array(
-    'title' => t('Add Association Rule'),
+    'title' => 'Add Association Rule',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('civicrm_member_roles_add_rule_form', 1),
     'access callback' => 'user_access',
@@ -54,7 +54,7 @@ function civicrm_member_roles_menu() {
   );
 
   $items['admin/config/civicrm/civicrm_member_roles/configure'] = array(
-    'title' => t('Configure'),
+    'title' => 'Configure',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('civicrm_member_roles_configure'),
     'access callback' => 'user_access',
@@ -63,7 +63,7 @@ function civicrm_member_roles_menu() {
   );
 
   $items['admin/config/civicrm/civicrm_member_roles/manual_sync'] = array(
-    'title' => t('Manually Synchronize'),
+    'title' => 'Manually Synchronize',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('civicrm_member_roles_manual_sync'),
     'access callback' => 'user_access',
@@ -75,26 +75,26 @@ function civicrm_member_roles_menu() {
 }
 
 /**
- * Implementation of hook_permission().
+ * Implements hook_permission().
  */
 function civicrm_member_roles_permission() {
   return array(
-    'access civicrm member role setting' =>
-    array('title' => t('Access CiviCRM member role setting'),
+    'access civicrm member role setting' => array(
+      'title' => t('Access CiviCRM member role setting'),
       'description' => t('Access Civicrm member roles synchronization.'),
     ),
   );
 }
 
 /**
- * Implementation of hook_user_login().
+ * Implements hook_user_login().
  */
 function civicrm_member_roles_user_login(&$edit, $account) {
   civicrm_member_roles_sync_user($account);
 }
 
 /**
- * Implementation of hook_user_logout().
+ * Implements hook_user_logout().
  */
 function civicrm_member_roles_user_logout($account) {
   civicrm_member_roles_sync_user($account);
@@ -110,7 +110,7 @@ function civicrm_member_roles_sync_user($account) {
 }
 
 /**
- * Implementation of hook_cron().
+ * Implements hook_cron().
  */
 function civicrm_member_roles_cron() {
   if (!civicrm_initialize(TRUE)) {
@@ -146,7 +146,8 @@ function civicrm_member_roles_show_rules($action = NULL, $id = NULL) {
   $roles  = user_roles(TRUE);
 
   //Begin building main output table.
-  $header = array('rid' => t('Rule ID'),
+  $header = array(
+    'rid' => t('Rule ID'),
     'rule_name' => t('Rule Name ("CiviMember Membership Type" --> "Drupal Role")'),
     'current_code' => t('Add When Status Is'),
     'expired_code' => t('Remove When Status Is'),
@@ -212,7 +213,9 @@ function civicrm_member_roles_manual_sync() {
 }
 
 /**
- * Implementation of hook_submit() for the manual sync form.
+ * Implements hook_submit().
+ *
+ * For the manual sync form.
  */
 function civicrm_member_roles_manual_sync_submit($form, &$form_state) {
   if (!civicrm_initialize()) {
@@ -262,7 +265,9 @@ function civicrm_member_roles_configure() {
 }
 
 /**
- * Implementation of hook_form(). Add/edit association rules.
+ * Implements hook_form().
+ *
+ * Add/edit association rules.
  *
  * @ingroup forms
  * @see civicrm_member_roles_add_rule_validate()
@@ -310,14 +315,14 @@ function civicrm_member_roles_add_rule_form($form = NULL, $form_state = NULL, $i
   $form['status_code']['current'] = array(
     '#type' => 'checkboxes',
     '#title' => t('Add Statuses'),
-    '#description' => t('Select all CiviMember Status Rule(s) that represent an \'add\' status.'),
+    '#description' => t("Select all CiviMember Status Rule(s) that represent an 'add' status."),
     '#options' => $status_options,
     '#required' => TRUE,
   );
   $form['status_code']['expired'] = array(
     '#type' => 'checkboxes',
     '#title' => t('Removal Statuses'),
-    '#description' => t('Select all CiviMember Status Rule(s) that represent a \'removal\' status.'),
+    '#description' => t("Select all CiviMember Status Rule(s) that represent a 'removal' status."),
     '#options' => $status_options,
     '#required' => TRUE,
   );
@@ -356,7 +361,9 @@ function civicrm_member_roles_add_rule_form($form = NULL, $form_state = NULL, $i
 }
 
 /**
- * Implementation of hook_validate() for the add/edit rule form.
+ * Implements hook_validate().
+ *
+ * For the add/edit rule form.
  */
 function civicrm_member_roles_add_rule_form_validate($form, &$form_state) {
   //Make sure there is a CiviMember Membership Type and a Drupal Role selected.
@@ -406,7 +413,9 @@ function civicrm_member_roles_add_rule_form_validate($form, &$form_state) {
 }
 
 /**
- * Implementation of hook_submit() for the add/edit rule form.
+ * Implements hook_submit().
+ *
+ * For the add/edit rule form.
  */
 function civicrm_member_roles_add_rule_form_submit($form, &$form_state) {
   if (!civicrm_initialize()) {
@@ -432,7 +441,7 @@ function civicrm_member_roles_add_rule_form_submit($form, &$form_state) {
         'rid' => (int) $form_state['values']['add_rule']['select_role'],
         'type_id' => (int) $form_state['values']['add_rule']['select_membership'],
         'status_codes' => serialize($codes),
-      ))->condition('rule_id', (int)$form_state['values']['edit_flag'])->execute();
+      ))->condition('rule_id', (int) $form_state['values']['edit_flag'])->execute();
 
     if ($edit_rule) {
       drupal_set_message(t('Your association rule has been edited.'));
@@ -464,7 +473,7 @@ function civicrm_member_roles_add_rule_form_submit($form, &$form_state) {
  */
 function _civicrm_member_roles_sync($ext_uid = NULL, $cid = NULL, $sync_type = NULL) {
   if (!civicrm_initialize()) {
-    return;
+    return FALSE;
   }
 
   $rules = db_query('SELECT * FROM {civicrm_member_roles_rules}')->fetchAll();
@@ -474,8 +483,8 @@ function _civicrm_member_roles_sync($ext_uid = NULL, $cid = NULL, $sync_type = N
   $memberroles = $rid = array();
   foreach ($rules as $ruleValues) {
     $memberroles[$ruleValues->type_id][] = array(
-        'rid' => $ruleValues->rid,
-        'codes' => unserialize($ruleValues->status_codes),
+      'rid' => $ruleValues->rid,
+      'codes' => unserialize($ruleValues->status_codes),
     );
     $rid[] = $ruleValues->rid;
   }
@@ -544,27 +553,29 @@ function _civicrm_member_roles_sync($ext_uid = NULL, $cid = NULL, $sync_type = N
     //CRM-16000 added try/catch to api call
     try {
       $memberships = civicrm_api3('membership', 'get', $memParams);
-    } catch (CiviCRM_API3_Exception $e) {
+    }
+    catch (CiviCRM_API3_Exception $e) {
       $error = $e->getMessage();
       return $error;
     }
     //CRM-16000 remove inactive memberships if member has both active and inactive memberships
-    if ($memberships['count'] > 1){
+    if ($memberships['count'] > 1) {
       $params = array(
         'sequential' => 1,
         'name' => array('IN' => array("Deceased", "Cancelled", "Pending", "Expired")),
       );
       try {
         $result = civicrm_api3('MembershipStatus', 'get', $params);
-      } catch (CiviCRM_API3_Exception $e){
+      }
+      catch (CiviCRM_API3_Exception $e) {
         $error = $e->getMessage();
         return $error;
       }
-      foreach ($result['values'] as $value){
+      foreach ($result['values'] as $value) {
         $inactive[] = $value['id'];
       }
       foreach ($memberships['values'] as $key => $membership) {
-        if (in_array($membership['status_id'], $inactive)){
+        if (in_array($membership['status_id'], $inactive)) {
           unset($membership['values'][$key]);
         }
       }

From f4d009188df6694f0652ee5a02df3d4f4786bb80 Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Fri, 15 Sep 2017 09:45:01 +1000
Subject: [PATCH 20/86] NFC Civilint civicrm_contact_ref module

---
 .../civicrm_contact_ref.feeds.inc             |  2 +-
 .../civicrm_contact_ref.install               | 17 ++++++++-------
 .../civicrm_contact_ref.module                | 21 +++++++++++--------
 3 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/modules/civicrm_contact_ref/civicrm_contact_ref.feeds.inc b/modules/civicrm_contact_ref/civicrm_contact_ref.feeds.inc
index 9ba2967..1b185dc 100644
--- a/modules/civicrm_contact_ref/civicrm_contact_ref.feeds.inc
+++ b/modules/civicrm_contact_ref/civicrm_contact_ref.feeds.inc
@@ -7,7 +7,7 @@
 /**
  * Implements hook_feeds_processor_targets_alter().
  *
- * @see FeedsNodeProcessor::getMappingTargets().
+ * @see FeedsNodeProcessor::getMappingTargets()
  */
 function civicrm_contact_ref_feeds_processor_targets_alter(&$targets, $entity_type, $bundle_name) {
   foreach (field_info_instances($entity_type, $bundle_name) as $name => $instance) {
diff --git a/modules/civicrm_contact_ref/civicrm_contact_ref.install b/modules/civicrm_contact_ref/civicrm_contact_ref.install
index 2c224d2..a3acc98 100644
--- a/modules/civicrm_contact_ref/civicrm_contact_ref.install
+++ b/modules/civicrm_contact_ref/civicrm_contact_ref.install
@@ -1,22 +1,23 @@
 <?php
 
-/*
- * Implemenation of hook_enable()
+/**
+ * Implements hook_enable().
  */
 function civicrm_contact_ref_enable() {
   db_query("UPDATE {system} SET weight = 110 WHERE name = 'civicrm_contact_ref'");
 }
 
-/*
- * Implemenation of hook_field_schema()
+/**
+ * Implements hook_field_schema().
  */
 function civicrm_contact_ref_field_schema($field) {
   return array(
-    'columns' =>
-    array(
-      'contact_id' => array('type' => 'int',
+    'columns' => array(
+      'contact_id' => array(
+        'type' => 'int',
         'unsigned' => TRUE,
         'not null' => FALSE,
-      )),
+      ),
+    ),
   );
 }
diff --git a/modules/civicrm_contact_ref/civicrm_contact_ref.module b/modules/civicrm_contact_ref/civicrm_contact_ref.module
index c03ae6e..23037a4 100644
--- a/modules/civicrm_contact_ref/civicrm_contact_ref.module
+++ b/modules/civicrm_contact_ref/civicrm_contact_ref.module
@@ -7,7 +7,7 @@
 function civicrm_contact_ref_menu() {
   $items = array();
   $items['civicrm_contact_ref/autocomplete'] = array(
-    'title' => t('Contacts'),
+    'title' => 'Contacts',
     'page callback' => 'civicrm_contact_ref_autocomplete_value',
     'type' => MENU_CALLBACK,
     'access arguments' => array('access content'),
@@ -17,7 +17,7 @@ function civicrm_contact_ref_menu() {
 }
 
 /**
- * Implemetation of hook_field_info
+ * Implemets hook_field_info
  */
 function civicrm_contact_ref_field_info() {
   return array(
@@ -33,7 +33,7 @@ function civicrm_contact_ref_field_info() {
 }
 
 /**
- * Implemetation of hook_field_widget_info
+ * Implemets hook_field_widget_info().
  */
 function civicrm_contact_ref_field_widget_info() {
   return array(
@@ -50,7 +50,7 @@ function civicrm_contact_ref_field_widget_info() {
 }
 
 /**
- * Implemetation of hook_field_widget_info_alter
+ * ImplemetS hook_field_widget_info_alter().
  */
 function civicrm_contact_ref_field_widget_info_alter(&$info) {
   $info['options_select']['field types'][] = 'civicrm_contact_ref_contact';
@@ -93,7 +93,7 @@ function civicrm_contact_ref_field_formatter_info() {
 }
 
 /**
- * Implements hook_field_formatter_view()
+ * Implements hook_field_formatter_view().
  */
 function civicrm_contact_ref_field_formatter_view($entity_type, $entity, $field, $instance, $langcode, $items, $display) {
   $element = array();
@@ -149,7 +149,7 @@ function civicrm_contact_ref_field_formatter_view($entity_type, $entity, $field,
  * @param $field
  *   The field definition.
  *
- * @return
+ * @return array
  *   The array of valid contacts.
  */
 function civicrm_contact_ref_allowed_values($field) {
@@ -260,7 +260,7 @@ function civicrm_contact_ref_autocomplete_validate($element, &$form_state) {
   form_set_value($element, $cid, $form_state);
 }
 
-/*
+/**
  * Function to provide values for autocomplete civicrm contact
  * element, depend upon entered string.
  */
@@ -296,7 +296,7 @@ function civicrm_contact_ref_autocomplete_value($field_name, $string = '') {
  * @param $exact_string
  *   Optional: should the title filter be an exact match.
  *
- * @return
+ * @return array
  *   An array of valid nodes in the form:
  *   array(
  *     nid => array(
@@ -427,7 +427,9 @@ WHERE  id = %1";
 }
 
 /**
- * Implements hook_field_views_data() to allow for views relationships
+ * Implements hook_field_views_data().
+ *
+ * To allow for views relationships
  */
 function civicrm_contact_ref_field_views_data($field) {
   $data = field_views_field_default_views_data($field);
@@ -455,6 +457,7 @@ function civicrm_contact_ref_field_views_data($field) {
 
 /**
  * Implements hook_civicrm_merge().
+ *
  * Update field data to reflect new cids when contacts are merged.
  */
 function civicrm_contact_ref_civicrm_merge($type, $data, $new_id = NULL, $old_id = NULL, $tables = NULL) {

From b4d00fa74fe3ce54c6d0fb8ccd876af75c8999f1 Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Sat, 16 Sep 2017 10:28:35 +1000
Subject: [PATCH 21/86] Civilint views components files

---
 modules/views/components/civicrm.campaign.inc |  20 +-
 modules/views/components/civicrm.case.inc     |  30 +-
 .../views/components/civicrm.contribute.inc   |  25 +-
 modules/views/components/civicrm.core.inc     | 363 +++++++++---------
 modules/views/components/civicrm.event.inc    |  28 +-
 modules/views/components/civicrm.grant.inc    |   3 +-
 modules/views/components/civicrm.lineitem.inc | 221 ++++++-----
 modules/views/components/civicrm.mail.inc     | 118 +++---
 modules/views/components/civicrm.member.inc   |  20 +-
 .../views/components/civicrm.price_set.inc    | 122 +++---
 10 files changed, 444 insertions(+), 506 deletions(-)

diff --git a/modules/views/components/civicrm.campaign.inc b/modules/views/components/civicrm.campaign.inc
index ad8a534..78cd12d 100644
--- a/modules/views/components/civicrm.campaign.inc
+++ b/modules/views/components/civicrm.campaign.inc
@@ -21,7 +21,7 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  * Build the $data array for CiviCampaign related tables
@@ -66,7 +66,7 @@ function _civicrm_campaign_data(&$data, $enabled) {
   // Campaign's Name
   $data['civicrm_campaign']['name'] = array(
     'title' => t('Name'),
-    'help' => t('Campaign\'s name'),
+    'help' => t("Campaign's name"),
     'field' => array(
       'handler' => 'views_handler_field',
       'click sortable' => TRUE,
@@ -85,7 +85,7 @@ function _civicrm_campaign_data(&$data, $enabled) {
   // Campaign Title
   $data['civicrm_campaign']['title'] = array(
     'title' => t('Title'),
-    'help' => t('Campaing\'s title'),
+    'help' => t("Campaing's title"),
     'field' => array(
       'handler' => 'views_handler_field',
       'click sortable' => TRUE,
@@ -104,7 +104,7 @@ function _civicrm_campaign_data(&$data, $enabled) {
   //Campaign Description
   $data['civicrm_campaign']['description'] = array(
     'title' => t('Description'),
-    'help' => t('Campaing\'s description'),
+    'help' => t("Campaing's description"),
     'field' => array(
       'handler' => 'views_handler_field',
       'click sortable' => TRUE,
@@ -113,7 +113,7 @@ function _civicrm_campaign_data(&$data, $enabled) {
   //Mailing finish date
   $data['civicrm_campaign']['start_date'] = array(
     'title' => t('Start Date'),
-    'help' => t('The Campaign\'s Start Date'),
+    'help' => t("The Campaign's Start Date"),
     'field' => array(
       'handler' => 'civicrm_handler_field_datetime',
       'click sortable' => TRUE,
@@ -138,7 +138,7 @@ function _civicrm_campaign_data(&$data, $enabled) {
   //Mailing finish date
   $data['civicrm_campaign']['end_date'] = array(
     'title' => t('End Date'),
-    'help' => t('The Campaign\'s End Date'),
+    'help' => t("The Campaign's End Date"),
     'field' => array(
       'handler' => 'civicrm_handler_field_datetime',
       'click sortable' => TRUE,
@@ -211,7 +211,7 @@ function _civicrm_campaign_data(&$data, $enabled) {
   // Parent Campaign ID
   $data['civicrm_campaign']['parent_id'] = array(
     'title' => t('Parent Campaign ID'),
-    'help' => t('The ID of the campaign\'s parent campaign'),
+    'help' => t("The ID of the campaign's parent campaign"),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
       'click sortable' => TRUE,
@@ -249,7 +249,7 @@ function _civicrm_campaign_data(&$data, $enabled) {
   // Campaign's General Goal
   $data['civicrm_campaign']['goal_general'] = array(
     'title' => t('General Goal'),
-    'help' => t('Campaing\'s general goal'),
+    'help' => t("Campaing's general goal"),
     'field' => array(
       'handler' => 'views_handler_field',
       'click sortable' => TRUE,
@@ -289,7 +289,6 @@ function _civicrm_campaign_data(&$data, $enabled) {
   // Add Support of Survey Fields.
   $data['civicrm_survey']['table']['group'] = t('CiviCRM Surveys');
 
-
   $data['civicrm_survey']['table']['base'] = array(
     // Governs the whole mozilla
     'field' => 'id',
@@ -341,8 +340,6 @@ function _civicrm_campaign_data(&$data, $enabled) {
     ),
   );
 
-
-
   //Activity Type
   $data['civicrm_survey']['activity_type'] = array(
     'title' => t('Activity Type'),
@@ -408,4 +405,3 @@ function _civicrm_campaign_data(&$data, $enabled) {
   //$skipFields = array( );
   civicrm_views_add_fields($fields, $data['civicrm_survey'], 'civicrm_survey');
 }
-
diff --git a/modules/views/components/civicrm.case.inc b/modules/views/components/civicrm.case.inc
index 683f63e..5136b84 100644
--- a/modules/views/components/civicrm.case.inc
+++ b/modules/views/components/civicrm.case.inc
@@ -21,14 +21,13 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  * Build the $data array for CiviCase related tables
  * Includes the following tables
  * civicrm_case
  */
-
 function _civicrm_case_data(&$data, $enabled) {
 
   /**
@@ -133,7 +132,7 @@ function _civicrm_case_data(&$data, $enabled) {
   //CASE Start DATE
   $data['civicrm_case']['start_date'] = array(
     'title' => t('Start Date'),
-    'help' => t('The Case\'s Start Date'),
+    'help' => t("The Case's Start Date"),
     'field' => array(
       'handler' => 'civicrm_handler_field_datetime',
       'click sortable' => TRUE,
@@ -160,7 +159,7 @@ function _civicrm_case_data(&$data, $enabled) {
   //CASE END DATE
   $data['civicrm_case']['end_date'] = array(
     'title' => t('End Date'),
-    'help' => t('The Case\'s End Date'),
+    'help' => t("The Case's End Date"),
     'field' => array(
       'handler' => 'civicrm_handler_field_datetime',
       'click sortable' => TRUE,
@@ -233,7 +232,7 @@ function _civicrm_case_data(&$data, $enabled) {
     'field' => array(
       'handler' => 'views_handler_field_boolean',
       'click sortable' => TRUE,
-   ),
+    ),
     'argument' => array(
       'handler' => 'views_handler_argument',
     ),
@@ -245,7 +244,6 @@ function _civicrm_case_data(&$data, $enabled) {
     ),
   );
 
-
   //----------------------------------------------------------------
   // CIVICRM Case Activities are here, base tabling it up.
   //----------------------------------------------------------------
@@ -300,8 +298,8 @@ function _civicrm_case_data(&$data, $enabled) {
     'help' => t('The numeric ID of the Case'),
     'relationship' => array(
       'base' => 'civicrm_case',
-                                                                             'field' => 'case_id',
-                                                                             'left_field' => 'id',
+      'field' => 'case_id',
+      'left_field' => 'id',
       'handler' => 'views_handler_relationship',
       'label' => t('CiviCRM Case, with custom fields'),
     ),
@@ -309,7 +307,7 @@ function _civicrm_case_data(&$data, $enabled) {
 
   //Numeric Activity ID
   $data['civicrm_case_activity']['activity_id'] = array(
-    'title' => t('Case Activity\'s Activity ID'),
+    'title' => t("Case Activity's Activity ID"),
     'help' => t('The numeric ID of the Activity of the Case'),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
@@ -401,8 +399,8 @@ function _civicrm_case_data(&$data, $enabled) {
     'help' => t('The numeric ID of the Case'),
     'relationship' => array(
       'base' => 'civicrm_case',
-                                                                             'field' => 'case_id',
-                                                                             'left_field' => 'id',
+      'field' => 'case_id',
+      'left_field' => 'id',
       'handler' => 'views_handler_relationship',
       'label' => t('CiviCRM Case, with custom fields'),
     ),
@@ -410,7 +408,7 @@ function _civicrm_case_data(&$data, $enabled) {
 
   //Numeric Contact ID
   $data['civicrm_case_contact']['contact_id'] = array(
-    'title' => t('Case Contact\'s Contact ID'),
+    'title' => t("Case Contact's Contact ID"),
     'help' => t('The numeric ID of the Contact of the Case'),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
@@ -464,14 +462,14 @@ function _civicrm_case_data(&$data, $enabled) {
     'real field' => 'title',
     'help' => t('The Name of the Case Type'),
     'field' => array(
-    'handler' => 'views_handler_field',
-    'click sortable' => TRUE,
+      'handler' => 'views_handler_field',
+      'click sortable' => TRUE,
     ),
     'argument' => array(
-     'handler' => 'views_handler_argument',
+      'handler' => 'views_handler_argument',
     ),
     'sort' => array(
-    'handler' => 'views_handler_sort',
+      'handler' => 'views_handler_sort',
     ),
   );
 }
diff --git a/modules/views/components/civicrm.contribute.inc b/modules/views/components/civicrm.contribute.inc
index e1ecf39..3c76762 100644
--- a/modules/views/components/civicrm.contribute.inc
+++ b/modules/views/components/civicrm.contribute.inc
@@ -21,7 +21,7 @@
   | GNU Affero General Public License or the licensing of CiviCRM,     |
   | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
   +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  * Build the $data array for CiviContribute related tables
@@ -60,7 +60,7 @@ function _civicrm_contribute_data(&$data, $enabled) {
   );
 
   //TABLE JOINS FOR CIVICRM CONTRIBUTIONS GO HERE!
-  
+
   $data['civicrm_contribution']['table']['join']['civicrm_contact'] = array(
     'left_table' => 'civicrm_contact',
     'left_field' => 'id',
@@ -187,8 +187,6 @@ function _civicrm_contribute_data(&$data, $enabled) {
     ),
   );
 
-
-
   //Contribution Receive Date
   $data['civicrm_contribution']['receive_date'] = array(
     'title' => t('Date Received'),
@@ -523,7 +521,7 @@ function _civicrm_contribute_data(&$data, $enabled) {
   );
   $data['civicrm_contribution']['check_number'] = array(
     'title' => t('Check Number'),
-    'help' => t('Contribution\'s Check Number'),
+    'help' => t("Contribution's Check Number"),
     'field' => array(
       'handler' => 'views_handler_field',
       'click sortable' => TRUE,
@@ -576,14 +574,10 @@ function _civicrm_contribute_data(&$data, $enabled) {
       'label' => t('Contribution -> line-item'),
     ),
   );
-  
-  /*
-   * Soft Credits
-   */
 
+  // Soft Credits
   $data['civicrm_contribution_soft']['table']['group'] = t('CiviCRM  Soft Credits');
 
-
   //TABLE JOINS FOR CIVICRM CONTRIBUTIONS GO HERE!
   $data['civicrm_contribution_soft']['table']['join']['civicrm_contribution'] = array(
     'left_table' => 'civicrm_contribution',
@@ -698,15 +692,9 @@ function _civicrm_contribute_data(&$data, $enabled) {
     ),
   );
 
-
-  /*
-     * Soft Credits
-     */
-
-
+  // Soft Credits
   $data['civicrm_contribution_recur']['table']['group'] = t('CiviCRM  Recurring Contributions');
 
-
   //TABLE JOINS FOR CIVICRM CONTRIBUTIONS GO HERE!
   $data['civicrm_contribution_recur']['table']['join']['civicrm_contribution'] = array(
     'left_table' => 'civicrm_contribution',
@@ -1007,7 +995,7 @@ function _civicrm_contribute_data(&$data, $enabled) {
   $data['civicrm_contribution_recur']['contribution_status'] = array(
     'title' => t('Contribution Status'),
     'real field' => 'contribution_status_id',
-    'help' => t('The Contribution\'s Status'),
+    'help' => t("The Contribution's Status"),
     'field' => array(
       'handler' => 'civicrm_handler_field_pseudo_constant',
       'click sortable' => TRUE,
@@ -1530,4 +1518,3 @@ function _civicrm_contribute_data(&$data, $enabled) {
     ),
   );
 }
-
diff --git a/modules/views/components/civicrm.core.inc b/modules/views/components/civicrm.core.inc
index db509de..790aced 100644
--- a/modules/views/components/civicrm.core.inc
+++ b/modules/views/components/civicrm.core.inc
@@ -21,7 +21,7 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  * Build the $data array for all the filed that are part of any CivicRM install
@@ -44,7 +44,6 @@ function _civicrm_core_data(&$data, $enabled) {
   // CiviCRM Contacts Views Table
   //------------------------------------------------------
 
-
   $data['civicrm_contact']['table']['group'] = t('CiviCRM Contacts');
 
   $data['civicrm_contact']['table']['base'] = array(
@@ -262,7 +261,7 @@ function _civicrm_core_data(&$data, $enabled) {
   $data['civicrm_contact']['gender'] = array(
     'title' => t('Gender'),
     'real field' => 'gender_id',
-    'help' => t('Contact\'s Gender'),
+    'help' => t("Contact's Gender"),
     'field' => array(
       'handler' => 'civicrm_handler_field_pseudo_constant',
       'click sortable' => TRUE,
@@ -603,7 +602,7 @@ function _civicrm_core_data(&$data, $enabled) {
     'title' => t('Organization Name'),
     'real field' => 'organization_name',
     // The help that appears on the UI,
-    'help' => t('The display name of the contact\'s organizations.'),
+    'help' => t("The display name of the contact's organizations."),
     'field' => array(
       'handler' => 'views_handler_field',
       'click sortable' => TRUE,
@@ -663,7 +662,7 @@ function _civicrm_core_data(&$data, $enabled) {
   //Birth Date
   $data['civicrm_contact']['birth_date'] = array(
     'title' => t('Birth Date'),
-    'help' => t('The contact\'s birth date.'),
+    'help' => t("The contact's birth date."),
     'field' => array(
       'handler' => 'civicrm_handler_field_datetime',
       'click sortable' => TRUE,
@@ -680,7 +679,7 @@ function _civicrm_core_data(&$data, $enabled) {
   //Deceased Date
   $data['civicrm_contact']['deceased_date'] = array(
     'title' => t('Deceased Date'),
-    'help' => t('The contact\'s deceased date.'),
+    'help' => t("The contact's deceased date."),
     'field' => array(
       'handler' => 'civicrm_handler_field_datetime',
       'click sortable' => TRUE,
@@ -697,7 +696,7 @@ function _civicrm_core_data(&$data, $enabled) {
   // Last modified date
   $data['civicrm_contact']['modified_date'] = array(
     'title' => t('Modified date'),
-    'help' => t('The date the contact\'s record was last modified.'),
+    'help' => t("The date the contact's record was last modified."),
     'field' => array(
       'handler' => 'civicrm_handler_field_datetime',
       'click sortable' => TRUE,
@@ -740,7 +739,6 @@ function _civicrm_core_data(&$data, $enabled) {
   );
   civicrm_views_add_fields($fields, $data['civicrm_contact'], 'civicrm_contact', $skipFields);
 
-
   // CHILLING OUT AT THE CIVICRM_ADDRESS TABLE
 
   $data['civicrm_address']['table']['group'] = t('CiviCRM Address');
@@ -755,8 +753,8 @@ function _civicrm_core_data(&$data, $enabled) {
   );
   //CiviCRM Address
   $data['civicrm_address']['table']['join']['civicrm_address'] = array(
-      'left_field' => 'id',
-      'field' => 'id',
+    'left_field' => 'id',
+    'field' => 'id',
   );
 
   //CiviCRM Address Using Contacts as a pitstop before going on to Participants
@@ -823,7 +821,7 @@ function _civicrm_core_data(&$data, $enabled) {
   //BOOLEAN : IS PRIMARY ADDRESS
   $data['civicrm_address']['is_primary'] = array(
     'title' => t('Is Primary Address'),
-    'help' => t('Is this address the contact\'s primary address?'),
+    'help' => t("Is this address the contact's primary address?"),
     'field' => array(
       'handler' => 'views_handler_field_boolean',
       'click sortable' => TRUE,
@@ -842,7 +840,7 @@ function _civicrm_core_data(&$data, $enabled) {
   //BOOLEAN : IS BILLING ADDRESS
   $data['civicrm_address']['is_billing'] = array(
     'title' => t('Is Billing Address'),
-    'help' => t('Is this address the contact\'s billing address?'),
+    'help' => t("Is this address the contact's billing address?"),
     'field' => array(
       'handler' => 'views_handler_field_boolean',
       'click sortable' => TRUE,
@@ -1177,7 +1175,6 @@ function _civicrm_core_data(&$data, $enabled) {
     ),
   );
 
-
   // CHILLING OUT AT THE CIVICRM_EMAIL TABLE
 
   $data['civicrm_email']['table']['group'] = t('CiviCRM Email');
@@ -1193,8 +1190,8 @@ function _civicrm_core_data(&$data, $enabled) {
 
   //CiviCRM Email
   $data['civicrm_email']['table']['join']['civicrm_email'] = array(
-      'left_field' => 'id',
-      'field' => 'id',
+    'left_field' => 'id',
+    'field' => 'id',
   );
 
   //CiviCRM Email Using Contacts as a pitstop before going on to Participants
@@ -1255,7 +1252,7 @@ function _civicrm_core_data(&$data, $enabled) {
   //BOOLEAN : IS PRIMARY EMAIL
   $data['civicrm_email']['is_primary'] = array(
     'title' => t('Is Primary Email'),
-    'help' => t('Is this address the contact\'s primary email?'),
+    'help' => t("Is this address the contact's primary email?"),
     'field' => array(
       'handler' => 'views_handler_field_boolean',
       'click sortable' => TRUE,
@@ -1275,7 +1272,7 @@ function _civicrm_core_data(&$data, $enabled) {
   //BOOLEAN : IS BILLING EMAIL
   $data['civicrm_email']['is_billing'] = array(
     'title' => t('Is Billing Email'),
-    'help' => t('Is this address the contact\'s billing email?'),
+    'help' => t("Is this address the contact's billing email?"),
     'field' => array(
       'handler' => 'views_handler_field_boolean',
       'click sortable' => TRUE,
@@ -1339,7 +1336,6 @@ function _civicrm_core_data(&$data, $enabled) {
     ),
   );
 
-
   // CHILLING OUT AT THE CIVICRM_PHONE TABLE
 
   $data['civicrm_phone']['table']['group'] = t('CiviCRM Phone Details');
@@ -1355,8 +1351,8 @@ function _civicrm_core_data(&$data, $enabled) {
 
   //CiviCRM Phone
   $data['civicrm_phone']['table']['join']['civicrm_phone'] = array(
-      'left_field' => 'id',
-      'field' => 'id',
+    'left_field' => 'id',
+    'field' => 'id',
   );
 
   //CiviCRM Phone Using Contacts as a pitstop before going on to Participants
@@ -1380,7 +1376,6 @@ function _civicrm_core_data(&$data, $enabled) {
     'field' => 'contact_id',
   );
 
-
   //CiviCRM Phone Using Locations as a pitstop before going on to Events
   $data['civicrm_phone']['table']['join']['civicrm_event'] = array(
     'left_table' => 'civicrm_loc_block',
@@ -1401,11 +1396,10 @@ function _civicrm_core_data(&$data, $enabled) {
     'field' => 'contact_id',
   );
 
-
   //BOOLEAN : IS PRIMARY EMAIL
   $data['civicrm_phone']['is_primary'] = array(
     'title' => t('Is Primary Phone'),
-    'help' => t('Is this the contact\'s primary phone?'),
+    'help' => t("Is this the contact's primary phone?"),
     'field' => array(
       'handler' => 'views_handler_field_boolean',
       'click sortable' => TRUE,
@@ -1424,7 +1418,7 @@ function _civicrm_core_data(&$data, $enabled) {
   //BOOLEAN : IS BILLING EMAIL
   $data['civicrm_phone']['is_billing'] = array(
     'title' => t('Is Billing Phone'),
-    'help' => t('Is this the contact\'s billing phone?'),
+    'help' => t("Is this the contact's billing phone?"),
     'field' => array(
       'handler' => 'views_handler_field_boolean',
       'click sortable' => TRUE,
@@ -1525,7 +1519,7 @@ function _civicrm_core_data(&$data, $enabled) {
   //CONTACT ID contact this number belongs to
   $data['civicrm_phone']['contact_id'] = array(
     'title' => t('Contact ID'),
-    'help' => t('Contact phone number belongs to '),
+    'help' => t('Contact phone number belongs to.'),
     'field' => array(
       'handler' => 'views_handler_field',
       'click sortable' => TRUE,
@@ -1577,212 +1571,209 @@ function _civicrm_core_data(&$data, $enabled) {
     ),
   );
 
-
   // CHILLING OUT AT THE CIVICRM_IM TABLE
 
   $data['civicrm_im']['table']['group'] = t('CiviCRM Instant Messaging');
 
   // Explain how this table joins to others.
   $data['civicrm_im']['table']['join'] = array(
-      // Directly links to contact table.
-      'civicrm_contact' => array(
-          'left_field' => 'id',
-          'field' => 'contact_id',
-      ),
+    // Directly links to contact table.
+    'civicrm_contact' => array(
+      'left_field' => 'id',
+      'field' => 'contact_id',
+    ),
   );
 
   //CiviCRM Im
   $data['civicrm_im']['table']['join']['civicrm_im'] = array(
-      'left_field' => 'id',
-      'field' => 'id',
+    'left_field' => 'id',
+    'field' => 'id',
   );
 
   //CiviCRM Im Using Contacts as a pitstop before going on to Participants
   $data['civicrm_im']['table']['join']['civicrm_participant'] = array(
-      'left_table' => 'civicrm_contact',
-      'left_field' => 'id',
-      'field' => 'contact_id',
+    'left_table' => 'civicrm_contact',
+    'left_field' => 'id',
+    'field' => 'contact_id',
   );
 
   //CiviCRM Im Using Contacts as a pitstop before going on to Contributions
   $data['civicrm_im']['table']['join']['civicrm_contribution'] = array(
-      'left_table' => 'civicrm_contact',
-      'left_field' => 'id',
-      'field' => 'contact_id',
+    'left_table' => 'civicrm_contact',
+    'left_field' => 'id',
+    'field' => 'contact_id',
   );
 
   //CiviCRM Im Using Contacts as a pitstop before going on to Activities
   $data['civicrm_im']['table']['join']['civicrm_activity'] = array(
-      'left_table' => 'civicrm_contact',
-      'left_field' => 'id',
-      'field' => 'contact_id',
+    'left_table' => 'civicrm_contact',
+    'left_field' => 'id',
+    'field' => 'contact_id',
   );
 
-
   //CiviCRM Im Using Locations as a pitstop before going on to Events
   $data['civicrm_im']['table']['join']['civicrm_event'] = array(
-      'left_table' => 'civicrm_loc_block',
-      'left_field' => 'im_id',
-      'field' => 'id',
+    'left_table' => 'civicrm_loc_block',
+    'left_field' => 'im_id',
+    'field' => 'id',
   );
   //CiviCRM Im Using Contacts as a pitstop before going on to Memberhsips
   $data['civicrm_im']['table']['join']['civicrm_membership'] = array(
-      'left_table' => 'civicrm_contact',
-      'left_field' => 'id',
-      'field' => 'contact_id',
+    'left_table' => 'civicrm_contact',
+    'left_field' => 'id',
+    'field' => 'contact_id',
   );
 
   //Display Im Details in User Views
   $data['civicrm_im']['table']['join']['users'] = array(
-      'left_table' => 'civicrm_uf_match',
-      'left_field' => 'contact_id',
-      'field' => 'contact_id',
+    'left_table' => 'civicrm_uf_match',
+    'left_field' => 'contact_id',
+    'field' => 'contact_id',
   );
 
-
   //BOOLEAN : IS PRIMARY IM
   $data['civicrm_im']['is_primary'] = array(
-      'title' => t('Is Primary Instant Messaging'),
-      'help' => t('Is this the contact\'s primary Instant Messaging?'),
-      'field' => array(
-          'handler' => 'views_handler_field_boolean',
-          'click sortable' => TRUE,
-      ),
-      'argument' => array(
-          'handler' => 'views_handler_argument',
-      ),
-      'filter' => array(
-          'handler' => 'views_handler_filter_boolean_operator',
-      ),
-      'sort' => array(
-          'handler' => 'views_handler_sort',
-      ),
+    'title' => t('Is Primary Instant Messaging'),
+    'help' => t("Is this the contact's primary Instant Messaging?"),
+    'field' => array(
+      'handler' => 'views_handler_field_boolean',
+      'click sortable' => TRUE,
+    ),
+    'argument' => array(
+      'handler' => 'views_handler_argument',
+    ),
+    'filter' => array(
+      'handler' => 'views_handler_filter_boolean_operator',
+    ),
+    'sort' => array(
+      'handler' => 'views_handler_sort',
+    ),
   );
 
   //BOOLEAN : IS BILLING IM
   $data['civicrm_im']['is_billing'] = array(
-      'title' => t('Is Billing Instant Messaging'),
-      'help' => t('Is this the contact\'s billing Instant Messaging?'),
-      'field' => array(
-          'handler' => 'views_handler_field_boolean',
-          'click sortable' => TRUE,
-      ),
-      'argument' => array(
-          'handler' => 'views_handler_argument',
-      ),
-      'filter' => array(
-          'handler' => 'views_handler_filter_boolean_operator',
-      ),
-      'sort' => array(
-          'handler' => 'views_handler_sort',
-      ),
+    'title' => t('Is Billing Instant Messaging'),
+    'help' => t("Is this the contact's billing Instant Messaging?"),
+    'field' => array(
+      'handler' => 'views_handler_field_boolean',
+      'click sortable' => TRUE,
+    ),
+    'argument' => array(
+      'handler' => 'views_handler_argument',
+    ),
+    'filter' => array(
+      'handler' => 'views_handler_filter_boolean_operator',
+    ),
+    'sort' => array(
+      'handler' => 'views_handler_sort',
+    ),
   );
 
   //IM'S LOCATION TYPE
   $data['civicrm_im']['location_type'] = array(
-      'title' => t('Location Type'),
-      'real field' => 'location_type_id',
-      'help' => t('The Location of the Instant Messaging for the Contact'),
-      'field' => array(
-          'handler' => 'civicrm_handler_field_pseudo_constant',
-          'click sortable' => TRUE,
-          'pseudo class' => 'CRM_Core_PseudoConstant',
-          'pseudo method' => 'get',
-          'dao class' => 'CRM_Core_DAO_IM',
-      ),
-      'argument' => array(
-          'handler' => 'views_handler_argument',
-      ),
-      'filter' => array(
-          'handler' => 'civicrm_handler_filter_pseudo_constant',
-          'allow empty' => TRUE,
-          'pseudo class' => 'CRM_Core_PseudoConstant',
-          'pseudo method' => 'get',
-          'dao class' => 'CRM_Core_DAO_IM',
-      ),
-      'sort' => array(
-          'handler' => 'views_handler_sort',
-      ),
+    'title' => t('Location Type'),
+    'real field' => 'location_type_id',
+    'help' => t('The Location of the Instant Messaging for the Contact'),
+    'field' => array(
+      'handler' => 'civicrm_handler_field_pseudo_constant',
+      'click sortable' => TRUE,
+      'pseudo class' => 'CRM_Core_PseudoConstant',
+      'pseudo method' => 'get',
+      'dao class' => 'CRM_Core_DAO_IM',
+    ),
+    'argument' => array(
+      'handler' => 'views_handler_argument',
+    ),
+    'filter' => array(
+      'handler' => 'civicrm_handler_filter_pseudo_constant',
+      'allow empty' => TRUE,
+      'pseudo class' => 'CRM_Core_PseudoConstant',
+      'pseudo method' => 'get',
+      'dao class' => 'CRM_Core_DAO_IM',
+    ),
+    'sort' => array(
+      'handler' => 'views_handler_sort',
+    ),
   );
 
   //NAME
   $data['civicrm_im']['name'] = array(
-      'title' => t('Name'),
-      'help' => t('IM screen name'),
-      'field' => array(
-          'handler' => 'civicrm_handler_field_im',
-          'click sortable' => TRUE,
-      ),
+    'title' => t('Name'),
+    'help' => t('IM screen name'),
+    'field' => array(
+      'handler' => 'civicrm_handler_field_im',
+      'click sortable' => TRUE,
+    ),
   );
 
   // IM ID
   $data['civicrm_im']['id'] = array(
-      'title' => t('Instant Messaging'),
-      'help' => t('Contact Instant Messaging'),
-      'relationship' => array(
-          'base' => 'civicrm_contact',
-          'field' => 'id',
-          'relationship table' => 'civicrm_im',
-          'relationship field' => 'contact_id',
-          'handler' => 'civicrm_handler_relationship_im',
-          'label' => t('CiviCRM Instant Messaging'),
-      ),
+    'title' => t('Instant Messaging'),
+    'help' => t('Contact Instant Messaging'),
+    'relationship' => array(
+      'base' => 'civicrm_contact',
+      'field' => 'id',
+      'relationship table' => 'civicrm_im',
+      'relationship field' => 'contact_id',
+      'handler' => 'civicrm_handler_relationship_im',
+      'label' => t('CiviCRM Instant Messaging'),
+    ),
   );
 
   //CONTACT ID contact this IM belongs to
   $data['civicrm_im']['contact_id'] = array(
-      'title' => t('Contact ID'),
-      'help' => t('Contact Instant Messaging belongs to '),
-      'field' => array(
-          'handler' => 'views_handler_field',
-          'click sortable' => TRUE,
-      ),
-      'argument' => array(
-          'handler' => 'views_handler_argument',
-      ),
-      'filter' => array(
-          'handler' => 'views_handler_filter_string',
-          'allow empty' => TRUE,
-      ),
-      'sort' => array(
-          'handler' => 'views_handler_sort',
-      ),
-      'relationship' => array(
-          'base' => 'civicrm_contact',
-          'base field' => 'id',
-          'handler' => 'views_handler_relationship',
-          'label' => t('Related Instant Messaging'),
-      ),
+    'title' => t('Contact ID'),
+    'help' => t('Contact Instant Messaging belongs to.'),
+    'field' => array(
+      'handler' => 'views_handler_field',
+      'click sortable' => TRUE,
+    ),
+    'argument' => array(
+      'handler' => 'views_handler_argument',
+    ),
+    'filter' => array(
+      'handler' => 'views_handler_filter_string',
+      'allow empty' => TRUE,
+    ),
+    'sort' => array(
+      'handler' => 'views_handler_sort',
+    ),
+    'relationship' => array(
+      'base' => 'civicrm_contact',
+      'base field' => 'id',
+      'handler' => 'views_handler_relationship',
+      'label' => t('Related Instant Messaging'),
+    ),
   );
 
   //IM Provider
   $data['civicrm_im']['provider'] = array(
-      'title' => t('IM Provider'),
-      'real field' => 'provider_id',
-      'help' => t('Which IM Provider does this screen name belong to'),
-      'field' => array(
-          'handler' => 'civicrm_handler_field_pseudo_constant',
-          'click sortable' => TRUE,
-          'pseudo class' => 'CRM_Core_PseudoConstant',
-          'pseudo method' => 'get',
-          'dao class' => 'CRM_Core_DAO_IM',
-      ),
-      'argument' => array(
-          'handler' => 'views_handler_argument',
-      ),
-      'filter' => array(
-          'handler' => 'civicrm_handler_filter_pseudo_constant',
-          'allow empty' => TRUE,
-          'pseudo class' => 'CRM_Core_PseudoConstant',
-          'pseudo method' => 'get',
-          'dao class' => 'CRM_Core_DAO_IM',
-      ),
-      'sort' => array(
-          'handler' => 'views_handler_sort',
-      ),
+    'title' => t('IM Provider'),
+    'real field' => 'provider_id',
+    'help' => t('Which IM Provider does this screen name belong to'),
+    'field' => array(
+      'handler' => 'civicrm_handler_field_pseudo_constant',
+      'click sortable' => TRUE,
+      'pseudo class' => 'CRM_Core_PseudoConstant',
+      'pseudo method' => 'get',
+      'dao class' => 'CRM_Core_DAO_IM',
+    ),
+    'argument' => array(
+      'handler' => 'views_handler_argument',
+    ),
+    'filter' => array(
+      'handler' => 'civicrm_handler_filter_pseudo_constant',
+      'allow empty' => TRUE,
+      'pseudo class' => 'CRM_Core_PseudoConstant',
+      'pseudo method' => 'get',
+      'dao class' => 'CRM_Core_DAO_IM',
+    ),
+    'sort' => array(
+      'handler' => 'views_handler_sort',
+    ),
   );
 
-// CHILLING OUT AT THE CIVICRM_WEBSITE TABLE
+  // CHILLING OUT AT THE CIVICRM_WEBSITE TABLE
 
   $data['civicrm_website']['table']['group'] = t('CiviCRM Website');
 
@@ -1797,8 +1788,8 @@ function _civicrm_core_data(&$data, $enabled) {
 
   //CiviCRM Website
   $data['civicrm_website']['table']['join']['civicrm_website'] = array(
-      'left_field' => 'id',
-      'field' => 'id',
+    'left_field' => 'id',
+    'field' => 'id',
   );
 
   //CiviCRM Website Using Contacts as a pitstop before going on to Participants
@@ -1822,7 +1813,6 @@ function _civicrm_core_data(&$data, $enabled) {
     'field' => 'contact_id',
   );
 
-
   //CiviCRM Website Using Contacts as a pitstop before going on to Memberhsips
   $data['civicrm_website']['table']['join']['civicrm_membership'] = array(
     'left_table' => 'civicrm_contact',
@@ -1830,7 +1820,6 @@ function _civicrm_core_data(&$data, $enabled) {
     'field' => 'contact_id',
   );
 
-
   //Display Websites in User Views
   $data['civicrm_website']['table']['join']['users'] = array(
     'left_table' => 'civicrm_uf_match',
@@ -2038,7 +2027,7 @@ function _civicrm_core_data(&$data, $enabled) {
   //Parent ID
   $data['civicrm_activity']['parent_id'] = array(
     'title' => t('Parent Activity ID'),
-    'help' => t('The numeric ID of the Parent Activity '),
+    'help' => t('The numeric ID of the Parent Activity.'),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
       'click sortable' => TRUE,
@@ -2100,7 +2089,7 @@ function _civicrm_core_data(&$data, $enabled) {
   //Activity Duration
   $data['civicrm_activity']['duration'] = array(
     'title' => t('Duration (min)'),
-    'help' => t('The Activity\'s Duration in Minutes'),
+    'help' => t("The Activity's Duration in Minutes"),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
       'click sortable' => TRUE,
@@ -2121,7 +2110,7 @@ function _civicrm_core_data(&$data, $enabled) {
   //Activity Location
   $data['civicrm_activity']['location'] = array(
     'title' => t('Location'),
-    'help' => t('Activity\'s Location in a text string.'),
+    'help' => t("Activity's Location in a text string."),
     'field' => array(
       'handler' => 'views_handler_field',
       'click sortable' => TRUE,
@@ -2158,7 +2147,6 @@ function _civicrm_core_data(&$data, $enabled) {
     ),
   );
 
-
   //BOOLEAN : IS A TEST ACTIVITY
   $data['civicrm_activity']['is_test'] = array(
     'title' => t('Is Test'),
@@ -2381,7 +2369,6 @@ function _civicrm_core_data(&$data, $enabled) {
     ),
   );
 
-
   //TEXT LINKS THAT AREN'T PART OF THE TABLE
   //Contact Text Link
   $data['civicrm_contact']['text_link'] = array(
@@ -2424,7 +2411,6 @@ function _civicrm_core_data(&$data, $enabled) {
     'field' => 'contact_id_a',
   );
 
-
   //CiviCRM Relationships - FIELDS
 
   //Numeric Relationship ID
@@ -2619,7 +2605,7 @@ function _civicrm_core_data(&$data, $enabled) {
   //Relationship start date
   $data['civicrm_relationship']['start_date'] = array(
     'title' => t('Start Date'),
-    'help' => t('The Relationship\'s Start Date'),
+    'help' => t("The Relationship's Start Date"),
     'field' => array(
       'handler' => 'civicrm_handler_field_datetime',
       'click sortable' => TRUE,
@@ -2641,7 +2627,7 @@ function _civicrm_core_data(&$data, $enabled) {
   //Relationship end date
   $data['civicrm_relationship']['end_date'] = array(
     'title' => t('End Date'),
-    'help' => t('The Relationship\'s End Date'),
+    'help' => t("The Relationship's End Date"),
     'field' => array(
       'handler' => 'civicrm_handler_field_datetime',
       'click sortable' => TRUE,
@@ -2713,10 +2699,7 @@ function _civicrm_core_data(&$data, $enabled) {
     );
   }
 
-  /*
-     * Add support for CivicRM groups table
-     */
-
+  // Add support for CivicRM groups table
 
   $data['civicrm_group']['table']['group'] = t('CiviCRM Groups');
 
@@ -2811,7 +2794,6 @@ function _civicrm_core_data(&$data, $enabled) {
     ),
   );
 
-
   $data['civicrm_group']['title'] = array(
     'title' => t('Title'),
     'help' => t('Group Title'),
@@ -2848,9 +2830,8 @@ function _civicrm_core_data(&$data, $enabled) {
       'handler' => 'views_handler_sort',
     ),
   );
-  /*
-     * Add support for CiviCRM tags
-     */
+
+  // Add support for CiviCRM tags
 
   $data['civicrm_tag']['table']['group'] = t('CiviCRM Tags');
 
@@ -2968,14 +2949,12 @@ function _civicrm_core_data(&$data, $enabled) {
     ),
   );
 
-  /*
-    * UF Match table - expose drupal ID
-    */
+  // UF Match table - expose drupal ID
 
   $data['civicrm_uf_match']['table']['group'] = t("CiviCRM Drupal match table");
   $data['civicrm_uf_match']['table']['join']['civicrm_contact'] = array(
     'left_field' => 'id',
-    'field' => 'contact_id'
+    'field' => 'contact_id',
   );
   $data['civicrm_uf_match']['uf_id'] = array(
     'title' => t('Drupal User ID'),
diff --git a/modules/views/components/civicrm.event.inc b/modules/views/components/civicrm.event.inc
index 8360e44..4b0e360 100644
--- a/modules/views/components/civicrm.event.inc
+++ b/modules/views/components/civicrm.event.inc
@@ -21,7 +21,7 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  * Build the $data array for CiviEvent related tables
@@ -181,7 +181,7 @@ function _civicrm_event_data(&$data, $enabled) {
   //EVENT TITLE
   $data['civicrm_event']['title'] = array(
     'title' => t('Title'),
-    'help' => t('The Event\'s Title'),
+    'help' => t("The Event's Title"),
     'field' => array(
       'handler' => 'civicrm_handler_field_event_link',
       'click sortable' => TRUE,
@@ -201,7 +201,7 @@ function _civicrm_event_data(&$data, $enabled) {
   // EVENT SUMMARY
   $data['civicrm_event']['summary'] = array(
     'title' => t('Summary'),
-    'help' => t('The Event\'s Summary'),
+    'help' => t("The Event's Summary"),
     'field' => array(
       'handler' => 'civicrm_handler_field_markup',
       'click sortable' => TRUE,
@@ -211,7 +211,7 @@ function _civicrm_event_data(&$data, $enabled) {
   // EVENT DESCRIPTION
   $data['civicrm_event']['description'] = array(
     'title' => t('Description'),
-    'help' => t('The Event\'s Full Description'),
+    'help' => t("The Event's Full Description"),
     'field' => array(
       'handler' => 'civicrm_handler_field_markup',
       'click sortable' => TRUE,
@@ -221,7 +221,7 @@ function _civicrm_event_data(&$data, $enabled) {
   //EVENT Start DATE
   $data['civicrm_event']['start_date'] = array(
     'title' => t('Start Date'),
-    'help' => t('The Event\'s Start Date'),
+    'help' => t("The Event's Start Date"),
     'field' => array(
       'handler' => 'civicrm_handler_field_datetime',
       'click sortable' => TRUE,
@@ -247,7 +247,7 @@ function _civicrm_event_data(&$data, $enabled) {
   //EVENT END DATE
   $data['civicrm_event']['end_date'] = array(
     'title' => t('End Date'),
-    'help' => t('The Event\'s End Date'),
+    'help' => t("The Event's End Date"),
     'field' => array(
       'handler' => 'civicrm_handler_field_datetime',
       'click sortable' => TRUE,
@@ -284,7 +284,7 @@ function _civicrm_event_data(&$data, $enabled) {
   //EVENT ONLINE REGISTRATION START DATE
   $data['civicrm_event']['registration_start_date'] = array(
     'title' => t('Registration Start Date'),
-    'help' => t('The Event\'s Online Registration Start Date'),
+    'help' => t("The Event's Online Registration Start Date"),
     'field' => array(
       'handler' => 'civicrm_handler_field_datetime',
       'click sortable' => TRUE,
@@ -305,7 +305,7 @@ function _civicrm_event_data(&$data, $enabled) {
   //EVENT ONLINE REGISTRATION END DATE
   $data['civicrm_event']['registration_end_date'] = array(
     'title' => t('Registration End Date'),
-    'help' => t('The Event\'s Online Registration End Date'),
+    'help' => t("The Event's Online Registration End Date"),
     'field' => array(
       'handler' => 'civicrm_handler_field_datetime',
       'click sortable' => TRUE,
@@ -369,7 +369,6 @@ function _civicrm_event_data(&$data, $enabled) {
     ),
   );
 
-
   //----------------------------------------------------------------
   // CIVICRM Participants are here, base tabling it up.
   //----------------------------------------------------------------
@@ -401,7 +400,6 @@ function _civicrm_event_data(&$data, $enabled) {
     'field' => 'contact_id',
   );
 
-
   //CiviCRM Participants - FIELDS
 
   //Numeric Participant ID
@@ -429,8 +427,8 @@ function _civicrm_event_data(&$data, $enabled) {
     'help' => t('The numeric ID of the Event'),
     'relationship' => array(
       'base' => 'civicrm_event',
-                                                                             'field' => 'event_id',
-                                                                             'left_field' => 'id',
+      'field' => 'event_id',
+      'left_field' => 'id',
       'handler' => 'views_handler_relationship',
       'label' => t('CiviCRM Event, with custom fields'),
     ),
@@ -438,7 +436,7 @@ function _civicrm_event_data(&$data, $enabled) {
 
   //Numeric Contact ID
   $data['civicrm_participant']['contact_id'] = array(
-    'title' => t('Participant\'s Contact ID'),
+    'title' => t("Participant's Contact ID"),
     'help' => t('The numeric ID of the Contact of the Participant'),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
@@ -467,7 +465,7 @@ function _civicrm_event_data(&$data, $enabled) {
   $data['civicrm_participant']['status'] = array(
     'title' => t('Participant Status'),
     'real field' => 'status_id',
-    'help' => t('The Status of the Participant\'s Booking and Attendance'),
+    'help' => t("The Status of the Participant's Booking and Attendance"),
     'field' => array(
       'handler' => 'civicrm_handler_field_pseudo_constant',
       'click sortable' => TRUE,
@@ -675,7 +673,7 @@ function _civicrm_event_data(&$data, $enabled) {
 
   $data['civicrm_participant_payment']['contribution_id'] = array(
     'title' => t('Participant Contribution Id'),
-    'help' => t('The numeric ID of the Participant\'s Contribution (for event fees).'),
+    'help' => t("The numeric ID of the Participant's Contribution (for event fees)."),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
       'click sortable' => TRUE,
diff --git a/modules/views/components/civicrm.grant.inc b/modules/views/components/civicrm.grant.inc
index 223708f..ed27b39 100644
--- a/modules/views/components/civicrm.grant.inc
+++ b/modules/views/components/civicrm.grant.inc
@@ -21,7 +21,7 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  * Build the $data array for CiviGrant related tables
@@ -330,4 +330,3 @@ function _civicrm_grant_data(&$data, $enabled) {
     ),
   );
 }
-
diff --git a/modules/views/components/civicrm.lineitem.inc b/modules/views/components/civicrm.lineitem.inc
index f0b1569..6e1c811 100644
--- a/modules/views/components/civicrm.lineitem.inc
+++ b/modules/views/components/civicrm.lineitem.inc
@@ -21,7 +21,7 @@
   | GNU Affero General Public License or the licensing of CiviCRM,     |
   | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
   +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  * Build the $data array for CiviLineItem related tables
@@ -60,41 +60,41 @@ function _civicrm_lineitem_data(&$data, $enabled) {
 
   // Line-item ID field
   $data['civicrm_line_item']['id'] = array(
-      'title' => t('ID'),
-      'help' => t('The numeric Line-item\'s ID.'),
-      'field' => array(
-          'handler' => 'views_handler_field_numeric',
-      ),
-      'argument' => array(
-          'handler' => 'views_handler_argument_numeric',
-      ),
-      'filter' => array(
-          'handler' => 'views_handler_filter_numeric',
-          'allow empty' => TRUE,
-      ),
-      'sort' => array(
-          'handler' => 'views_handler_sort',
-      ),
+    'title' => t('ID'),
+    'help' => t("The numeric Line-item's ID."),
+    'field' => array(
+      'handler' => 'views_handler_field_numeric',
+    ),
+    'argument' => array(
+      'handler' => 'views_handler_argument_numeric',
+    ),
+    'filter' => array(
+      'handler' => 'views_handler_filter_numeric',
+      'allow empty' => TRUE,
+    ),
+    'sort' => array(
+      'handler' => 'views_handler_sort',
+    ),
   );
 
   // Line-item label
   $data['civicrm_line_item']['label'] = array(
-      'title' => t('Label'),
-      'help' => t('The line item label, display the formatted amount'),
-      'field' => array(
-          'handler' => 'views_handler_field',
-          'click sortable' => TRUE,
-      ),
-      'argument' => array(
-          'handler' => 'views_handler_argument_string',
-      ),
-      'filter' => array(
-          'handler' => 'views_handler_filter_string',
-          'allow empty' => TRUE,
-      ),
-      'sort' => array(
-          'handler' => 'views_handler_sort',
-      ),
+    'title' => t('Label'),
+    'help' => t('The line item label, display the formatted amount'),
+    'field' => array(
+      'handler' => 'views_handler_field',
+      'click sortable' => TRUE,
+    ),
+    'argument' => array(
+      'handler' => 'views_handler_argument_string',
+    ),
+    'filter' => array(
+      'handler' => 'views_handler_filter_string',
+      'allow empty' => TRUE,
+    ),
+    'sort' => array(
+      'handler' => 'views_handler_sort',
+    ),
   );
 
   // Line-item - price field relationship
@@ -125,101 +125,100 @@ function _civicrm_lineitem_data(&$data, $enabled) {
 
   // Line-item - contribution relationship
   $data['civicrm_line_item']['entity_id'] = array(
-      'title' => t('Contribution Record ID'),
-      'help' => t('Bring Contribution Record the complete contribution record to the party'),
-      'relationship' => array(
-          'base' => 'civicrm_contribution',
-          'left_field' => 'id',
-          'field' => 'entity_id',
-          'handler' => 'views_handler_relationship',
-          'label' => t('CiviCRM Contribution, with custom fields'),
-      ),
+    'title' => t('Contribution Record ID'),
+    'help' => t('Bring Contribution Record the complete contribution record to the party'),
+    'relationship' => array(
+      'base' => 'civicrm_contribution',
+      'left_field' => 'id',
+      'field' => 'entity_id',
+      'handler' => 'views_handler_relationship',
+      'label' => t('CiviCRM Contribution, with custom fields'),
+    ),
   );
 
   // Line-Item Total amount
   $data['civicrm_line_item']['line_total'] = array(
-      'title' => t('Total Line Item'),
-      'help' => t('The Total for the line item'),
-      'field' => array(
-          'handler' => 'views_handler_field_numeric',
-          'click sortable' => TRUE,
-      ),
-      'argument' => array(
-          'handler' => 'views_handler_argument_numeric',
-          'numeric' => TRUE,
-      ),
-      'filter' => array(
-          'handler' => 'views_handler_filter_numeric',
-      ),
-      'sort' => array(
-          'handler' => 'views_handler_sort',
-      ),
+    'title' => t('Total Line Item'),
+    'help' => t('The Total for the line item'),
+    'field' => array(
+      'handler' => 'views_handler_field_numeric',
+      'click sortable' => TRUE,
+    ),
+    'argument' => array(
+      'handler' => 'views_handler_argument_numeric',
+      'numeric' => TRUE,
+    ),
+    'filter' => array(
+      'handler' => 'views_handler_filter_numeric',
+    ),
+    'sort' => array(
+      'handler' => 'views_handler_sort',
+    ),
   );
 
   // Line-Item unit price
   $data['civicrm_line_item']['unit_price'] = array(
-      'title' => t('Unit Price Item'),
-      'help' => t('The unit price for this line-item'),
-      'field' => array(
-          'handler' => 'civicrm_handler_field_money',
-          'click sortable' => TRUE,
-      ),
-      'argument' => array(
-          'handler' => 'views_handler_argument_numeric',
-          'numeric' => TRUE,
-      ),
-      'filter' => array(
-          'handler' => 'views_handler_filter_numeric',
-      ),
-      'sort' => array(
-          'handler' => 'views_handler_sort',
-      ),
+    'title' => t('Unit Price Item'),
+    'help' => t('The unit price for this line-item'),
+    'field' => array(
+      'handler' => 'civicrm_handler_field_money',
+      'click sortable' => TRUE,
+    ),
+    'argument' => array(
+      'handler' => 'views_handler_argument_numeric',
+      'numeric' => TRUE,
+    ),
+    'filter' => array(
+      'handler' => 'views_handler_filter_numeric',
+    ),
+    'sort' => array(
+      'handler' => 'views_handler_sort',
+    ),
   );
 
   // Line-Item quantity
   $data['civicrm_line_item']['qty'] = array(
-      'title' => t('Item quantity'),
-      'help' => t('The quantity for this line-item'),
-      'field' => array(
-          'handler' => 'views_handler_field_numeric',
-          'click sortable' => TRUE,
-      ),
-      'argument' => array(
-          'handler' => 'views_handler_argument_numeric',
-          'numeric' => TRUE,
-      ),
-      'filter' => array(
-          'handler' => 'views_handler_filter_numeric',
-      ),
-      'sort' => array(
-          'handler' => 'views_handler_sort',
-      ),
+    'title' => t('Item quantity'),
+    'help' => t('The quantity for this line-item'),
+    'field' => array(
+      'handler' => 'views_handler_field_numeric',
+      'click sortable' => TRUE,
+    ),
+    'argument' => array(
+      'handler' => 'views_handler_argument_numeric',
+      'numeric' => TRUE,
+    ),
+    'filter' => array(
+      'handler' => 'views_handler_filter_numeric',
+    ),
+    'sort' => array(
+      'handler' => 'views_handler_sort',
+    ),
   );
 
   // Line-item financial type
   $data['civicrm_line_item']['financial_type'] = array(
-      'title' => t('Line item Financial Type'),
-      'help' => t('Financial type for Line Item, ie Member Dues, Event Fees etc'),
-      'real field' => 'financial_type_id',
-      'field' => array(
-          'handler' => 'civicrm_handler_field_pseudo_constant',
-          'click sortable' => TRUE,
-          'pseudo class' => 'CRM_Contribute_PseudoConstant',
-          'pseudo method' => 'financialType',
-      ),
-      'argument' => array(
-          'handler' => 'views_handler_argument',
-      ),
-      'filter' => array(
-          'handler' => 'civicrm_handler_filter_pseudo_constant',
-          'allow empty' => TRUE,
-          'pseudo class' => 'CRM_Contribute_PseudoConstant',
-          'pseudo method' => 'financialType',
-      ),
-      'sort' => array(
-          'handler' => 'views_handler_sort',
-      ),
+    'title' => t('Line item Financial Type'),
+    'help' => t('Financial type for Line Item, ie Member Dues, Event Fees etc'),
+    'real field' => 'financial_type_id',
+    'field' => array(
+      'handler' => 'civicrm_handler_field_pseudo_constant',
+      'click sortable' => TRUE,
+      'pseudo class' => 'CRM_Contribute_PseudoConstant',
+      'pseudo method' => 'financialType',
+    ),
+    'argument' => array(
+      'handler' => 'views_handler_argument',
+    ),
+    'filter' => array(
+      'handler' => 'civicrm_handler_filter_pseudo_constant',
+      'allow empty' => TRUE,
+      'pseudo class' => 'CRM_Contribute_PseudoConstant',
+      'pseudo method' => 'financialType',
+    ),
+    'sort' => array(
+      'handler' => 'views_handler_sort',
+    ),
   );
 
 }
-
diff --git a/modules/views/components/civicrm.mail.inc b/modules/views/components/civicrm.mail.inc
index 3b96748..2cf8ab8 100644
--- a/modules/views/components/civicrm.mail.inc
+++ b/modules/views/components/civicrm.mail.inc
@@ -21,7 +21,7 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  * Build the $data array for CiviMail related tables
@@ -40,9 +40,7 @@
  * civicrm_mailing_event_unsubscribe
  */
 function _civicrm_mail_data(&$data, $enabled) {
-  /*
-     * CivicRM Mailings tables
-     */
+  // CivicRM Mailings tables
 
   $data['civicrm_mailing']['table']['group'] = t('CiviCRM Mailings');
 
@@ -67,7 +65,7 @@ function _civicrm_mail_data(&$data, $enabled) {
   // expose the ID to Views to allow users to drill down to a specific mailing.
   $data['civicrm_mailing']['id'] = array(
     'title' => t('ID'),
-    'help' => t('The mailing\'s ID in the database.'),
+    'help' => t("The mailing's ID in the database."),
     'argument' => array(
       'handler' => 'views_handler_argument_numeric',
     ),
@@ -82,11 +80,11 @@ function _civicrm_mail_data(&$data, $enabled) {
       'handler' => 'views_handler_sort',
     ),
   );
-  
+
   //expose the domain_id to Views to allow users to specify a domain.
   $data['civicrm_mailing']['domain_id'] = array(
     'title' => t('Domain ID'),
-    'help' => t('The mailing\'s Domain ID in the database.'),
+    'help' => t("The mailing's Domain ID in the database."),
     'argument' => array(
       'handler' => 'views_handler_argument_numeric',
     ),
@@ -101,11 +99,11 @@ function _civicrm_mail_data(&$data, $enabled) {
       'handler' => 'views_handler_sort',
     ),
   );
-  
+
   //expose the header_id to Views to choose mailings based on a header type
   $data['civicrm_mailing']['header_id'] = array(
     'title' => t('Header ID'),
-    'help' => t('The mailing\'s Header ID in the database.'),
+    'help' => t("The mailing's Header ID in the database."),
     'argument' => array(
       'handler' => 'views_handler_argument_numeric',
     ),
@@ -120,11 +118,11 @@ function _civicrm_mail_data(&$data, $enabled) {
       'handler' => 'views_handler_sort',
     ),
   );
-  
+
   //expose the footer_id to Views to choose mailings based on a footer type
   $data['civicrm_mailing']['footer_id'] = array(
     'title' => t('Footer ID'),
-    'help' => t('The mailing\'s Footer ID in the database.'),
+    'help' => t("The mailing's Footer ID in the database."),
     'argument' => array(
       'handler' => 'views_handler_argument_numeric',
     ),
@@ -139,12 +137,12 @@ function _civicrm_mail_data(&$data, $enabled) {
       'handler' => 'views_handler_sort',
     ),
   );
-  
+
   //expose the reply_id to Views to choose mailings based on a reply type
   //Or maybe this is to drill down to a single reply
   $data['civicrm_mailing']['reply_id'] = array(
     'title' => t('Reply ID'),
-    'help' => t('The mailing\'s Reply ID in the database.'),
+    'help' => t("The mailing's Reply ID in the database."),
     'argument' => array(
       'handler' => 'views_handler_argument_numeric',
     ),
@@ -159,12 +157,12 @@ function _civicrm_mail_data(&$data, $enabled) {
       'handler' => 'views_handler_sort',
     ),
   );
-  
+
   //expose the unsubscribe_id to Views to choose mailings based on an unsubscribe type
   //Or maybe this is to drill down to a single unsubscribe request
   $data['civicrm_mailing']['unsubscribe_id'] = array(
     'title' => t('Unsubscribe ID'),
-    'help' => t('The mailing\'s Unsubscribe ID in the database.'),
+    'help' => t("The mailing\'s Unsubscribe ID in the database."),
     'argument' => array(
       'handler' => 'views_handler_argument_numeric',
     ),
@@ -179,12 +177,12 @@ function _civicrm_mail_data(&$data, $enabled) {
       'handler' => 'views_handler_sort',
     ),
   );
-  
+
   //expose the resubscribe_id to Views to choose mailings based on an resubscribe type
   //Or maybe this is to drill down to a single rensubscribe request
   $data['civicrm_mailing']['resubscribe_id'] = array(
     'title' => t('Resubscribe ID'),
-    'help' => t('The mailing\'s Resubscribe ID in the database.'),
+    'help' => t("The mailing's Resubscribe ID in the database."),
     'argument' => array(
       'handler' => 'views_handler_argument_numeric',
     ),
@@ -199,12 +197,12 @@ function _civicrm_mail_data(&$data, $enabled) {
       'handler' => 'views_handler_sort',
     ),
   );
-  
+
   //expose the optout_id to Views to choose mailings based on an optout type
   //Or maybe this is to drill down to a single optout request
   $data['civicrm_mailing']['optout_id'] = array(
     'title' => t('Optout ID'),
-    'help' => t('The mailing\'s Optout ID in the database.'),
+    'help' => t("The mailing's Optout ID in the database."),
     'argument' => array(
       'handler' => 'views_handler_argument_numeric',
     ),
@@ -219,7 +217,7 @@ function _civicrm_mail_data(&$data, $enabled) {
       'handler' => 'views_handler_sort',
     ),
   );
-  
+
   //Mailing Name
   $data['civicrm_mailing']['name'] = array(
     'title' => t('Name'),
@@ -243,7 +241,7 @@ function _civicrm_mail_data(&$data, $enabled) {
       'handler' => 'views_handler_sort',
     ),
   );
-  
+
   //From Name
   $data['civicrm_mailing']['from_name'] = array(
     'title' => t('From Name'),
@@ -263,7 +261,7 @@ function _civicrm_mail_data(&$data, $enabled) {
       'handler' => 'views_handler_sort',
     ),
   );
-  
+
   //Mailing From e-mail
   $data['civicrm_mailing']['from_email'] = array(
     'title' => t('From Email'),
@@ -283,7 +281,7 @@ function _civicrm_mail_data(&$data, $enabled) {
       'handler' => 'views_handler_sort',
     ),
   );
-  
+
   //Mailing reply to e-mail
   $data['civicrm_mailing']['replyto_email'] = array(
     'title' => t('Reply to Email'),
@@ -363,7 +361,7 @@ function _civicrm_mail_data(&$data, $enabled) {
       'handler' => 'views_handler_sort',
     ),
   );
-  
+
   //Does the mailng track click throughs
   $data['civicrm_mailing']['url_tracking'] = array(
     'title' => t('Track URLs?'),
@@ -382,7 +380,7 @@ function _civicrm_mail_data(&$data, $enabled) {
       'handler' => 'views_handler_sort',
     ),
   );
-  
+
   //forward_replies
   //Should we forward replies back to the author?
   $data['civicrm_mailing']['forward_replies'] = array(
@@ -402,8 +400,8 @@ function _civicrm_mail_data(&$data, $enabled) {
       'handler' => 'views_handler_sort',
     ),
   );
-  
-  //auto_responder 
+
+  //auto_responder
   //Should we enable the auto-responder?
   $data['civicrm_mailing']['auto_responder'] = array(
     'title' => t('Auto Responder?'),
@@ -422,7 +420,7 @@ function _civicrm_mail_data(&$data, $enabled) {
       'handler' => 'views_handler_sort',
     ),
   );
-  
+
   //Does the e-mail track opens
   $data['civicrm_mailing']['open_tracking'] = array(
     'title' => t('Track Opens?'),
@@ -459,12 +457,12 @@ function _civicrm_mail_data(&$data, $enabled) {
       'handler' => 'views_handler_sort',
     ),
   );
-  
-  //msg_template_id 
+
+  //msg_template_id
   //FK to the message template
   $data['civicrm_mailing']['msg_template_id'] = array(
     'title' => t('Messaage Template ID'),
-    'help' => t('The mailing\'s Message Template ID in the database.'),
+    'help' => t("The mailing's Message Template ID in the database."),
     'argument' => array(
       'handler' => 'views_handler_argument_numeric',
     ),
@@ -479,8 +477,8 @@ function _civicrm_mail_data(&$data, $enabled) {
       'handler' => 'views_handler_sort',
     ),
   );
-  
-  //override_verp 
+
+  //override_verp
   //Should we overrite VERP address in Reply-To
   $data['civicrm_mailing']['is_completed'] = array(
     'title' => t('Overrite VERP?'),
@@ -499,12 +497,12 @@ function _civicrm_mail_data(&$data, $enabled) {
       'handler' => 'views_handler_sort',
     ),
   );
-  
-  //created_id 
+
+  //created_id
   //FK to Contact ID who first created this mailing
   $data['civicrm_mailing']['created_id'] = array(
     'title' => t('Creator ID'),
-    'help' => t('The user ID of the mailing\'s creator in the database.'),
+    'help' => t("The user ID of the mailing's creator in the database."),
     'argument' => array(
       'handler' => 'views_handler_argument_numeric',
     ),
@@ -519,11 +517,11 @@ function _civicrm_mail_data(&$data, $enabled) {
       'handler' => 'views_handler_sort',
     ),
   );
-  
-  //created_date	 
+
+  //created_date
   $data['civicrm_mailing']['created_date'] = array(
     'title' => t('Created Date'),
-    'help' => t('The Mailing\'s Created Date'),
+    'help' => t("The Mailing's Created Date"),
     'field' => array(
       'handler' => 'civicrm_handler_field_datetime',
       'click sortable' => TRUE,
@@ -544,13 +542,13 @@ function _civicrm_mail_data(&$data, $enabled) {
     'title' => 'Created Date',
       'name' => 'created_date',
     ));
-  
-  //scheduled_id	
-  
-  //scheduled_date	
+
+  //scheduled_id
+
+  //scheduled_date
   //Dealt with below: see $data['civicrm_mailing_job']['scheduled_date']
-  
-  //approver_id	
+
+  //approver_id
   // FK to Contact ID who approved this mailing
   $data['civicrm_mailing']['approver_id'] = array(
     'title' => t('Approver ID'),
@@ -569,12 +567,12 @@ function _civicrm_mail_data(&$data, $enabled) {
       'handler' => 'views_handler_sort',
     ),
   );
-  
-  //approval_date	
+
+  //approval_date
   // Date and time this mailing was approved.
   $data['civicrm_mailing']['approval_date'] = array(
     'title' => t('Approval Date'),
-    'help' => t('The Mailing\'s Approval Date'),
+    'help' => t("The Mailing's Approval Date"),
     'field' => array(
       'handler' => 'civicrm_handler_field_datetime',
       'click sortable' => TRUE,
@@ -595,7 +593,7 @@ function _civicrm_mail_data(&$data, $enabled) {
     'title' => 'Approval Date',
       'name' => 'approval_date',
     ));
-    
+
   //approval_status_id
   //Based on an option value. This value is an integer
   //Can we link the integer to the option value in the display?
@@ -616,7 +614,7 @@ function _civicrm_mail_data(&$data, $enabled) {
       'handler' => 'views_handler_sort',
     ),
   );
-  
+
   //approval_note
   $data['civicrm_mailing']['approval_note'] = array(
     'title' => t('Approval Note'),
@@ -721,7 +719,6 @@ function _civicrm_mail_data(&$data, $enabled) {
     ),
   );
 
-
   // mailing_component table aliased as mailing_footer
   $data['civicrm_mailing_footer']['table']['group'] = ts('CiviCRM Mailings');
 
@@ -752,7 +749,6 @@ function _civicrm_mail_data(&$data, $enabled) {
     ),
   );
 
-
   //Mailing Job table
   $data['civicrm_mailing_job']['table']['group'] = ts('CiviCRM Mailing Job');
 
@@ -767,7 +763,7 @@ function _civicrm_mail_data(&$data, $enabled) {
   //When is the mailing sceduled to go out
   $data['civicrm_mailing_job']['scheduled_date'] = array(
     'title' => t('Scheduled Date'),
-    'help' => t('The Mailing\'s Scheduled Date'),
+    'help' => t("The Mailing's Scheduled Date"),
     'field' => array(
       'handler' => 'civicrm_handler_field_datetime',
       'click sortable' => TRUE,
@@ -791,7 +787,7 @@ function _civicrm_mail_data(&$data, $enabled) {
   //When did the mailing start to send
   $data['civicrm_mailing_job']['start_date'] = array(
     'title' => t('Start Date'),
-    'help' => t('The Mailing\'s Start Date'),
+    'help' => t("The Mailing's Start Date"),
     'field' => array(
       'handler' => 'civicrm_handler_field_datetime',
       'click sortable' => TRUE,
@@ -812,7 +808,7 @@ function _civicrm_mail_data(&$data, $enabled) {
   //Mailing finish date
   $data['civicrm_mailing_job']['end_date'] = array(
     'title' => t('End Date'),
-    'help' => t('The Mailing\'s End Date'),
+    'help' => t("The Mailing's End Date"),
     'field' => array(
       'handler' => 'civicrm_handler_field_datetime',
       'click sortable' => TRUE,
@@ -831,7 +827,6 @@ function _civicrm_mail_data(&$data, $enabled) {
       'name' => 'end_date',
     ));
 
-
   //Is this a test mailing
   $data['civicrm_mailing_job']['is_test'] = array(
     'title' => t('Is Test?'),
@@ -958,8 +953,6 @@ function _civicrm_mail_data(&$data, $enabled) {
     ),
   );
 
-
-
   $data['civicrm_mailing_event_bounce']['table']['group'] = ts('CiviCRM Mailing Bounced');
 
   $data['civicrm_mailing_event_bounce']['table']['join'] = array(
@@ -1075,7 +1068,6 @@ function _civicrm_mail_data(&$data, $enabled) {
     ),
   );
 
-
   $data['civicrm_mailing_event_opened']['table']['group'] = ts('CiviCRM Mailing Opened');
 
   $data['civicrm_mailing_event_opened']['table']['join'] = array(
@@ -1124,7 +1116,6 @@ function _civicrm_mail_data(&$data, $enabled) {
     ),
   );
 
-
   $data['civicrm_mailing_event_reply']['table']['group'] = ts('CiviCRM Mailing Replied');
 
   $data['civicrm_mailing_event_reply']['table']['join'] = array(
@@ -1222,9 +1213,9 @@ function _civicrm_mail_data(&$data, $enabled) {
       'handler' => 'views_handler_sort',
     ),
   );
-  
+
   //Remaining tables in civicrm_mailing_event_unsubscribe:
-  //event_queue_id FK to EventQueue	
+  //event_queue_id FK to EventQueue
   $data['civicrm_mailing_event_unsubscribe']['event_queue_id'] = array(
     'title' => t('Event Queue ID'),
     'help' => t('The event queue ID of the unsubscribe record'),
@@ -1244,7 +1235,7 @@ function _civicrm_mail_data(&$data, $enabled) {
       'handler' => 'views_handler_sort',
     ),
   );
-  
+
   //org_unsubscribe Unsubscribe at org- or group-level
   $data['civicrm_mailing_event_unsubscribe']['org_unsubscribe'] = array(
     'title' => t('Unsubscribe at organisation or group level?'),
@@ -1264,4 +1255,3 @@ function _civicrm_mail_data(&$data, $enabled) {
     ),
   );
 }
-
diff --git a/modules/views/components/civicrm.member.inc b/modules/views/components/civicrm.member.inc
index 4f5f4f7..ffe913f 100644
--- a/modules/views/components/civicrm.member.inc
+++ b/modules/views/components/civicrm.member.inc
@@ -21,7 +21,7 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  * Build the $data array for CiviMember related tables
@@ -33,7 +33,6 @@ function _civicrm_member_data(&$data, $enabled) {
   // CIVICRM Memberships are here with all the connections.
   //----------------------------------------------------------------
 
-
   $data['civicrm_membership']['table']['group'] = t('CiviCRM Member');
 
   $data['civicrm_membership']['table']['base'] = array(
@@ -57,8 +56,6 @@ function _civicrm_member_data(&$data, $enabled) {
     'field' => 'contact_id',
   );
 
-
-
   //CiviCRM Memberships - FIELDS
 
   //Numeric Membership ID
@@ -126,11 +123,11 @@ function _civicrm_member_data(&$data, $enabled) {
       'handler' => 'views_handler_sort',
     ),
   );
-  
+
   //Membership Join date
   $data['civicrm_membership']['join_date'] = array(
     'title' => t('Join Date'),
-    'help' => t('The Membership\'s Start Date'),
+    'help' => t("The Membership's Start Date"),
     'field' => array(
       'handler' => 'civicrm_handler_field_datetime',
       'click sortable' => TRUE,
@@ -152,7 +149,7 @@ function _civicrm_member_data(&$data, $enabled) {
   //Membership start date
   $data['civicrm_membership']['start_date'] = array(
     'title' => t('Start Date'),
-    'help' => t('The Membership\'s Start Date'),
+    'help' => t("The Membership's Start Date"),
     'field' => array(
       'handler' => 'civicrm_handler_field_datetime',
       'click sortable' => TRUE,
@@ -171,11 +168,10 @@ function _civicrm_member_data(&$data, $enabled) {
       'name' => 'start_date',
     ));
 
-
   //Membership end date
   $data['civicrm_membership']['end_date'] = array(
     'title' => t('End Date'),
-    'help' => t('The Membership\'s End Date'),
+    'help' => t("The Membership's End Date"),
     'field' => array(
       'handler' => 'civicrm_handler_field_datetime',
       'click sortable' => TRUE,
@@ -194,7 +190,6 @@ function _civicrm_member_data(&$data, $enabled) {
       'name' => 'end_date',
     ));
 
-
   //membership Source
   $data['civicrm_membership']['source'] = array(
     'title' => t('Source'),
@@ -260,7 +255,7 @@ function _civicrm_member_data(&$data, $enabled) {
   //Membership end date
   $data['civicrm_membership']['reminder_date'] = array(
     'title' => t('Reminder Date'),
-    'help' => t('The Membership\'s Reminder Date'),
+    'help' => t("The Membership's Reminder Date"),
     'field' => array(
       'handler' => 'civicrm_handler_field_datetime',
       'click sortable' => TRUE,
@@ -279,8 +274,6 @@ function _civicrm_member_data(&$data, $enabled) {
       'name' => 'reminder_date',
     ));
 
-
-
   //Numeric Membership Owner ID
   $data['civicrm_membership']['owner_membership_id'] = array(
     'title' => t('Membership Owner ID'),
@@ -365,4 +358,3 @@ function _civicrm_member_data(&$data, $enabled) {
     );
   }
 }
-
diff --git a/modules/views/components/civicrm.price_set.inc b/modules/views/components/civicrm.price_set.inc
index 26ae164..2d19ab0 100644
--- a/modules/views/components/civicrm.price_set.inc
+++ b/modules/views/components/civicrm.price_set.inc
@@ -21,7 +21,7 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  * Build the $data array for Price Set related tables
@@ -32,11 +32,11 @@
  * civicrm_price_field_value
  */
 function _civicrm_price_set_data(&$data, $enabled) {
-  
+
   //----------------------------------------------------------------
   // CIVICRM Price Set Entity - BASE TABLE
   //----------------------------------------------------------------
-  
+
   $data['civicrm_price_set_entity']['table']['group'] = t('CiviCRM Price Set Entities');
 
   $data['civicrm_price_set_entity']['table']['base'] = array(
@@ -44,11 +44,11 @@ function _civicrm_price_set_data(&$data, $enabled) {
     'title' => t('CiviCRM Price Set Entities'),
     'help' => t("View displays CiviCRM Price Set to Entity mapping info"),
   );
-  
+
   //----------------------------------------------------------------
   // CIVICRM Price Set Entity - TABLE JOINS
   //----------------------------------------------------------------
-    
+
   $data['civicrm_price_set_entity']['table']['join'] = array(
     // Directly links to event table.
     'civicrm_event' => array(
@@ -56,11 +56,11 @@ function _civicrm_price_set_data(&$data, $enabled) {
       'field' => 'entity_id',
     ),
   );
-  
+
   //----------------------------------------------------------------
   // CIVICRM Price Set Entity - FIELDS
   //----------------------------------------------------------------
-      
+
   // Numeric: Price Set ID
   $data['civicrm_price_set_entity']['price_set_id'] = array(
     'title' => t('Price Set ID'),
@@ -100,11 +100,11 @@ function _civicrm_price_set_data(&$data, $enabled) {
       'handler' => 'views_handler_sort',
     ),
   );
-  
+
   //----------------------------------------------------------------
   // CIVICRM Price Set Entity - RELATIONSHIPS
   //----------------------------------------------------------------
-    
+
   // Price Set
   $data['civicrm_price_set_entity']['price_set'] = array(
     'title' => t('Price Set'),
@@ -117,7 +117,7 @@ function _civicrm_price_set_data(&$data, $enabled) {
       'label' => t('Price Set'),
     ),
   );
-  
+
   //----------------------------------------------------------------
   // CIVICRM Price Set - BASE TABLE
   //----------------------------------------------------------------
@@ -129,11 +129,11 @@ function _civicrm_price_set_data(&$data, $enabled) {
     'title' => t('CiviCRM Price Sets'),
     'help' => t("View displays CiviCRM Price Sets"),
   );
-  
+
   //----------------------------------------------------------------
   // CIVICRM Price Set - FIELDS
   //----------------------------------------------------------------
-    
+
   // Numeric: Price Set ID
   $data['civicrm_price_set']['id'] = array(
     'title' => t('Price Set ID'),
@@ -177,7 +177,7 @@ function _civicrm_price_set_data(&$data, $enabled) {
   // Name
   $data['civicrm_price_set']['name'] = array(
     'title' => t('Name'),
-    'help' => t('The Price Set\'s machine name'),
+    'help' => t("The Price Set's machine name"),
     'field' => array(
       'handler' => 'views_handler_field',
       'click sortable' => TRUE,
@@ -193,11 +193,11 @@ function _civicrm_price_set_data(&$data, $enabled) {
       'handler' => 'views_handler_sort',
     ),
   );
-  
+
   // Title
   $data['civicrm_price_set']['title'] = array(
     'title' => t('Title'),
-    'help' => t('The Price Set\'s title'),
+    'help' => t("The Price Set's title"),
     'field' => array(
       'handler' => 'views_handler_field',
       'click sortable' => TRUE,
@@ -213,7 +213,7 @@ function _civicrm_price_set_data(&$data, $enabled) {
       'handler' => 'views_handler_sort',
     ),
   );
-  
+
   // Boolean: Is Active
   $data['civicrm_price_set']['is_active'] = array(
     'title' => t('Is Active'),
@@ -232,7 +232,7 @@ function _civicrm_price_set_data(&$data, $enabled) {
       'handler' => 'views_handler_sort',
     ),
   );
- 
+
   // Extends
   $data['civicrm_price_set']['extends'] = array(
     'title' => t('Extends'),
@@ -252,7 +252,7 @@ function _civicrm_price_set_data(&$data, $enabled) {
       'handler' => 'views_handler_sort',
     ),
   );
-  
+
   // Financial Type
   $data['civicrm_price_set']['financial_type'] = array(
     'title' => t('Financial Type'),
@@ -275,7 +275,7 @@ function _civicrm_price_set_data(&$data, $enabled) {
       'handler' => 'views_handler_sort',
     ),
   );
-  
+
   // Boolean: Is Quick Config
   $data['civicrm_price_set']['is_quick_config'] = array(
     'title' => t('Is Quick Config'),
@@ -294,7 +294,7 @@ function _civicrm_price_set_data(&$data, $enabled) {
       'handler' => 'views_handler_sort',
     ),
   );
-  
+
   // Boolean: Is Reserved
   $data['civicrm_price_set']['is_reserved'] = array(
     'title' => t('Is Reserved'),
@@ -313,23 +313,23 @@ function _civicrm_price_set_data(&$data, $enabled) {
       'handler' => 'views_handler_sort',
     ),
   );
-  
+
   //----------------------------------------------------------------
   // CIVICRM Price Field - BASE TABLE
   //----------------------------------------------------------------
-  
+
   $data['civicrm_price_field']['table']['group'] = t('CiviCRM Price Fields');
-  
+
   $data['civicrm_price_field']['table']['base'] = array(
     'field' => 'id',
     'title' => t('CiviCRM Price Fields'),
     'help' => t("View displays CiviCRM Price Fields"),
   );
-  
+
   //----------------------------------------------------------------
   // CIVICRM Price Field - FIELDS
   //----------------------------------------------------------------
-  
+
   // Numeric: Price Field ID
   $data['civicrm_price_field']['id'] = array(
     'title' => t('Price Field ID'),
@@ -373,7 +373,7 @@ function _civicrm_price_set_data(&$data, $enabled) {
   // Name
   $data['civicrm_price_field']['name'] = array(
     'title' => t('Name'),
-    'help' => t('The Price Field\'s machine name'),
+    'help' => t("The Price Field's machine name"),
     'field' => array(
       'handler' => 'views_handler_field',
       'click sortable' => TRUE,
@@ -389,11 +389,11 @@ function _civicrm_price_set_data(&$data, $enabled) {
       'handler' => 'views_handler_sort',
     ),
   );
-  
+
   // Label
   $data['civicrm_price_field']['label'] = array(
     'title' => t('Label'),
-    'help' => t('The Price Field\'s label'),
+    'help' => t("The Price Field's label"),
     'field' => array(
       'handler' => 'views_handler_field',
       'click sortable' => TRUE,
@@ -413,7 +413,7 @@ function _civicrm_price_set_data(&$data, $enabled) {
   // HTML Type
   $data['civicrm_price_field']['html_type'] = array(
     'title' => t('HTML Type'),
-    'help' => t('The Price Field\'s HTML type (Text, Select, Radio, or Checkbox)'),
+    'help' => t("The Price Field's HTML type (Text, Select, Radio, or Checkbox)"),
     'field' => array(
       'handler' => 'views_handler_field',
       'click sortable' => TRUE,
@@ -429,7 +429,7 @@ function _civicrm_price_set_data(&$data, $enabled) {
       'handler' => 'views_handler_sort',
     ),
   );
-  
+
   // Boolean: Is Enter Quantity
   $data['civicrm_price_field']['is_enter_qty'] = array(
     'title' => t('Is Enter Quantity'),
@@ -448,7 +448,7 @@ function _civicrm_price_set_data(&$data, $enabled) {
       'handler' => 'views_handler_sort',
     ),
   );
- 
+
   // Numeric: Weight
   $data['civicrm_price_field']['weight'] = array(
     'title' => t('Weight'),
@@ -468,7 +468,7 @@ function _civicrm_price_set_data(&$data, $enabled) {
       'handler' => 'views_handler_sort',
     ),
   );
-  
+
   // Boolean: Is Display Amounts
   $data['civicrm_price_field']['is_display_amounts'] = array(
     'title' => t('Is Display Amounts'),
@@ -487,7 +487,7 @@ function _civicrm_price_set_data(&$data, $enabled) {
       'handler' => 'views_handler_sort',
     ),
   );
- 
+
   // Boolean: Is Active
   $data['civicrm_price_field']['is_active'] = array(
     'title' => t('Is Active'),
@@ -506,7 +506,7 @@ function _civicrm_price_set_data(&$data, $enabled) {
       'handler' => 'views_handler_sort',
     ),
   );
- 
+
   // Boolean: Is Required
   $data['civicrm_price_field']['is_required'] = array(
     'title' => t('Is Required'),
@@ -525,7 +525,7 @@ function _civicrm_price_set_data(&$data, $enabled) {
       'handler' => 'views_handler_sort',
     ),
   );
-  
+
   // Date: Active On
   $data['civicrm_price_field']['active_on'] = array(
     'title' => t('Active On'),
@@ -547,7 +547,7 @@ function _civicrm_price_set_data(&$data, $enabled) {
       'is date' => TRUE,
     ),
   );
-  
+
   // Date: Expire On
   $data['civicrm_price_field']['expire_on'] = array(
     'title' => t('Expire On'),
@@ -569,7 +569,7 @@ function _civicrm_price_set_data(&$data, $enabled) {
       'is date' => TRUE,
     ),
   );
-  
+
   // Visibility
   $data['civicrm_price_field']['visibility'] = array(
     'title' => t('Visibility'),
@@ -592,11 +592,11 @@ function _civicrm_price_set_data(&$data, $enabled) {
       'handler' => 'views_handler_sort',
     ),
   );
-  
+
   //----------------------------------------------------------------
   // CIVICRM Price Field - RELATIONSHIPS
   //----------------------------------------------------------------
-  
+
   // Price Field Value
   $data['civicrm_price_field']['price_field_value'] = array(
     'title' => t('Price Field Value'),
@@ -622,23 +622,23 @@ function _civicrm_price_set_data(&$data, $enabled) {
       'label' => t('Price Set'),
     ),
   );
-  
+
   //----------------------------------------------------------------
   // CIVICRM Price Field Value - BASE TABLE
   //----------------------------------------------------------------
-  
+
   $data['civicrm_price_field_value']['table']['group'] = t('CiviCRM Price Field Values');
-  
+
   $data['civicrm_price_field_value']['table']['base'] = array(
     'field' => 'id',
     'title' => t('CiviCRM Price Field Values'),
     'help' => t("View displays CiviCRM Price Field Values"),
   );
-  
+
   //----------------------------------------------------------------
   // CIVICRM Price Field Value - FIELDS
   //----------------------------------------------------------------
-  
+
   // Numeric: Price Field Value ID
   $data['civicrm_price_field_value']['id'] = array(
     'title' => t('Price Field Value ID'),
@@ -682,7 +682,7 @@ function _civicrm_price_set_data(&$data, $enabled) {
   // Name
   $data['civicrm_price_field_value']['name'] = array(
     'title' => t('Name'),
-    'help' => t('The Price Field Value\'s machine name'),
+    'help' => t("The Price Field Value's machine name"),
     'field' => array(
       'handler' => 'views_handler_field',
       'click sortable' => TRUE,
@@ -698,11 +698,11 @@ function _civicrm_price_set_data(&$data, $enabled) {
       'handler' => 'views_handler_sort',
     ),
   );
-  
+
   // Label
   $data['civicrm_price_field_value']['label'] = array(
     'title' => t('Label'),
-    'help' => t('The Price Field\'s label'),
+    'help' => t("The Price Field's label"),
     'field' => array(
       'handler' => 'views_handler_field',
       'click sortable' => TRUE,
@@ -722,17 +722,17 @@ function _civicrm_price_set_data(&$data, $enabled) {
   // Description
   $data['civicrm_price_field_value']['description'] = array(
     'title' => t('Description'),
-    'help' => t('The Price Field Value\'s Description'),
+    'help' => t("The Price Field Value's Description"),
     'field' => array(
       'handler' => 'civicrm_handler_field_markup',
       'click sortable' => TRUE,
     ),
   );
-  
+
   // Numeric: Amount
   $data['civicrm_price_field_value']['amount'] = array(
     'title' => t('Amount'),
-    'help' => t('The Price Field Value\'s amount'),
+    'help' => t("The Price Field Value's amount"),
     'field' => array(
       'handler' => 'civicrm_handler_field_money',
       'click sortable' => TRUE,
@@ -748,7 +748,7 @@ function _civicrm_price_set_data(&$data, $enabled) {
       'handler' => 'views_handler_sort',
     ),
   );
-  
+
   // Numeric: Count
   $data['civicrm_price_field_value']['count'] = array(
     'title' => t('Count'),
@@ -768,7 +768,7 @@ function _civicrm_price_set_data(&$data, $enabled) {
       'handler' => 'views_handler_sort',
     ),
   );
-  
+
   // Numeric: Max Value
   $data['civicrm_price_field_value']['max_value'] = array(
     'title' => t('Max Value'),
@@ -790,7 +790,7 @@ function _civicrm_price_set_data(&$data, $enabled) {
       'handler' => 'views_handler_sort',
     ),
   );
-  
+
   // Numeric: Weight
   $data['civicrm_price_field_value']['weight'] = array(
     'title' => t('Weight'),
@@ -810,7 +810,7 @@ function _civicrm_price_set_data(&$data, $enabled) {
       'handler' => 'views_handler_sort',
     ),
   );
-  
+
   // Numeric: Membership Type ID
   $data['civicrm_price_field_value']['membership_type_id'] = array(
     'title' => t('Membership Type ID'),
@@ -830,7 +830,7 @@ function _civicrm_price_set_data(&$data, $enabled) {
       'handler' => 'views_handler_sort',
     ),
   );
-  
+
   // Membership Num Terms
   $data['civicrm_price_field_value']['membership_num_terms'] = array(
     'title' => t('Membership Number of Terms'),
@@ -850,7 +850,7 @@ function _civicrm_price_set_data(&$data, $enabled) {
       'handler' => 'views_handler_sort',
     ),
   );
-  
+
   // Boolean: Is Default
   $data['civicrm_price_field_value']['is_default'] = array(
     'title' => t('Is Default'),
@@ -869,7 +869,7 @@ function _civicrm_price_set_data(&$data, $enabled) {
       'handler' => 'views_handler_sort',
     ),
   );
-  
+
   // Boolean: Is Active
   $data['civicrm_price_field_value']['is_active'] = array(
     'title' => t('Is Active'),
@@ -888,7 +888,7 @@ function _civicrm_price_set_data(&$data, $enabled) {
       'handler' => 'views_handler_sort',
     ),
   );
-  
+
   // Financial Type
   $data['civicrm_price_field_value']['financial_type'] = array(
     'title' => t('Financial Type'),
@@ -909,7 +909,7 @@ function _civicrm_price_set_data(&$data, $enabled) {
       'handler' => 'views_handler_sort',
     ),
   );
-   
+
   // Numeric: Deductible Amount
   $data['civicrm_price_field_value']['deductible_amount'] = array(
     'title' => t('Deductible Amount'),
@@ -929,5 +929,5 @@ function _civicrm_price_set_data(&$data, $enabled) {
       'handler' => 'views_handler_sort',
     ),
   );
-  
-}
\ No newline at end of file
+
+}

From 82f535b049f0173d1b6a0ac3543cec1f1d51a952 Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Sat, 16 Sep 2017 10:42:32 +1000
Subject: [PATCH 22/86] Civilint views plugins files

---
 .../plugins/calendar_plugin_row_civicrm.inc     | 17 ++++++++---------
 .../calendar_plugin_row_civicrm_event.inc       | 15 +++++++--------
 ...vicrm_plugin_argument_default_civicrm_id.inc | 15 ++++++++-------
 3 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/modules/views/plugins/calendar_plugin_row_civicrm.inc b/modules/views/plugins/calendar_plugin_row_civicrm.inc
index 7725a37..fcac142 100644
--- a/modules/views/plugins/calendar_plugin_row_civicrm.inc
+++ b/modules/views/plugins/calendar_plugin_row_civicrm.inc
@@ -22,14 +22,14 @@ class calendar_plugin_row_civicrm extends calendar_plugin_row {
   // Basic properties that let the row style follow relationships.
   var $base_table = '';
   var $base_field = 'id';
-  function construct() {
+  public function construct() {
     parent::construct();
     if (!civicrm_initialize()) {
       return;
     }
     $this->base_table = $this->definition['base'][0];
   }
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
     $options['date_fields'] = array('default' => array());
     $options['calendar_date_link'] = array('default' => '');
@@ -45,7 +45,7 @@ class calendar_plugin_row_civicrm extends calendar_plugin_row {
   /**
    * Provide a form for setting options.
    */
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
 
     $form['markup']['#markup'] = t("The calendar row plugin will format view results as calendar items. Make sure this display has a 'Calendar' format and uses a 'Date' contextual filter, or this plugin will not work correctly.");
@@ -65,9 +65,9 @@ class calendar_plugin_row_civicrm extends calendar_plugin_row {
       '#type' => 'value',
       '#value' => '',
     );
-    }
+  }
 
-  function pre_render($values) {
+  public function pre_render($values) {
 
     $ids = array();
     foreach ($values as $row) {
@@ -81,7 +81,7 @@ class calendar_plugin_row_civicrm extends calendar_plugin_row {
     // Sadly neither DAO nor API allows you to load multiple at once eg node_load_multiple()
     foreach ($ids as $key => $id) {
       require_once str_replace('_', DIRECTORY_SEPARATOR, $this->definition['dao class']) . '.php';
-      $dao = New $this->definition['dao class'];
+      $dao = New $this->definition['dao class']();
       $dao->id = $id;
       $dao->find();
       $dao->fetch();
@@ -92,7 +92,6 @@ class calendar_plugin_row_civicrm extends calendar_plugin_row {
       $dao->release();
     }
 
-
     // Identify the date argument and fields that apply to this view.
     // Preload the Date Views field info for each field, keyed by the
     // field name, so we know how to retrieve field values from the cached node.
@@ -122,7 +121,7 @@ class calendar_plugin_row_civicrm extends calendar_plugin_row {
     }
   }
 
-  function render($row) {
+  public function render($row) {
     global $base_url;
     $date_info = $this->date_argument->view->date_info;
     $id = $row->{$this->field_alias};
@@ -222,5 +221,5 @@ class calendar_plugin_row_civicrm extends calendar_plugin_row {
     }
     return $rows;
   }
-}
 
+}
diff --git a/modules/views/plugins/calendar_plugin_row_civicrm_event.inc b/modules/views/plugins/calendar_plugin_row_civicrm_event.inc
index 44112ad..8b51cff 100644
--- a/modules/views/plugins/calendar_plugin_row_civicrm_event.inc
+++ b/modules/views/plugins/calendar_plugin_row_civicrm_event.inc
@@ -16,14 +16,14 @@ class calendar_plugin_row_civicrm_event extends calendar_plugin_row_node {
 
   // Stores the nodes loaded with pre_render.
   var $nodes = array();
-  function construct() {
+  public function construct() {
     parent::construct();
     if (!civicrm_initialize()) {
       return;
     }
   }
 
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
     $options['date_fields'] = array('default' => array());
     $options['calendar_date_link'] = array('default' => '');
@@ -39,7 +39,7 @@ class calendar_plugin_row_civicrm_event extends calendar_plugin_row_node {
   /**
    * Provide a form for setting options.
    */
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
 
     $form['markup']['#markup'] = t("The calendar row plugin will format view results as calendar items. Make sure this display has a 'Calendar' format and uses a 'Date' contextual filter, or this plugin will not work correctly.");
@@ -88,7 +88,7 @@ class calendar_plugin_row_civicrm_event extends calendar_plugin_row_node {
     }
   }
 
-  function pre_render($values) {
+  public function pre_render($values) {
 
     $ids = array();
     foreach ($values as $row) {
@@ -101,7 +101,7 @@ class calendar_plugin_row_civicrm_event extends calendar_plugin_row_node {
     // and object, hence using DAO
     foreach ($ids as $key => $id) {
       require_once 'CRM/Event/DAO/Event.php';
-      $dao = New CRM_Event_DAO_Event;
+      $dao = New CRM_Event_DAO_Event();
       $dao->id = $id;
       $dao->find();
       $dao->fetch();
@@ -112,7 +112,6 @@ class calendar_plugin_row_civicrm_event extends calendar_plugin_row_node {
       $dao->release();
     }
 
-
     // Identify the date argument and fields that apply to this view.
     // Preload the Date Views field info for each field, keyed by the
     // field name, so we know how to retrieve field values from the cached node.
@@ -142,7 +141,7 @@ class calendar_plugin_row_civicrm_event extends calendar_plugin_row_node {
     }
   }
 
-  function render($row) {
+  public function render($row) {
     global $base_url;
     $date_info = $this->date_argument->view->date_info;
 
@@ -246,5 +245,5 @@ class calendar_plugin_row_civicrm_event extends calendar_plugin_row_node {
     }
     return $rows;
   }
-}
 
+}
diff --git a/modules/views/plugins/civicrm_plugin_argument_default_civicrm_id.inc b/modules/views/plugins/civicrm_plugin_argument_default_civicrm_id.inc
index e1ac7ca..ad4d61b 100644
--- a/modules/views/plugins/civicrm_plugin_argument_default_civicrm_id.inc
+++ b/modules/views/plugins/civicrm_plugin_argument_default_civicrm_id.inc
@@ -1,5 +1,4 @@
 <?php
-
 /*
  +--------------------------------------------------------------------+
  | CiviCRM version 4.7                                                |
@@ -22,19 +21,21 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
- * @file
- * Contains a plugin to extract CiviCRM IDs from the URL.
+ * @file Contains a plugin to extract CiviCRM IDs from the URL.
  */
 
+/**
+ * Class civicrm_plugin_argument_default_civicrm_id
+ */
 class civicrm_plugin_argument_default_civicrm_id extends views_plugin_argument_default {
 
   /**
    * List the options relevant for this plugin.
    */
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
     $options['id_type'] = array('default' => 'Contact');
     return $options;
@@ -43,7 +44,7 @@ class civicrm_plugin_argument_default_civicrm_id extends views_plugin_argument_d
   /**
    * Provide the default form for setting options.
    */
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
     $form['id_type'] = array(
       '#type' => 'select',
@@ -61,7 +62,7 @@ class civicrm_plugin_argument_default_civicrm_id extends views_plugin_argument_d
   /**
    * Get the default argument.
    */
-  function get_argument() {
+  public function get_argument() {
 
     switch ($this->options['id_type']) {
 

From a5da0f12237763cec825980a4b8e6a21bdc269cc Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Sat, 16 Sep 2017 10:50:21 +1000
Subject: [PATCH 23/86] Civilint civicrm_handler_field_website.inc

---
 .../civicrm/civicrm_handler_field_website.inc | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/modules/views/civicrm/civicrm_handler_field_website.inc b/modules/views/civicrm/civicrm_handler_field_website.inc
index 3950ed2..da8354c 100644
--- a/modules/views/civicrm/civicrm_handler_field_website.inc
+++ b/modules/views/civicrm/civicrm_handler_field_website.inc
@@ -21,7 +21,7 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  * Field handler for website field
@@ -31,7 +31,7 @@
 class civicrm_handler_field_website extends civicrm_handler_field_location {
   static $_websiteType;
 
-  function construct() {
+  public function construct() {
     parent::construct();
     if (!self::$_websiteType) {
       if (!civicrm_initialize()) {
@@ -41,13 +41,13 @@ class civicrm_handler_field_website extends civicrm_handler_field_location {
     }
   }
 
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
     $options['website_type'] = array('default' => 0);
     return $options;
   }
 
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
     $websiteOptions = array(0 => 'Any');
     foreach (self::$_websiteType as $id => $type) {
@@ -63,7 +63,7 @@ class civicrm_handler_field_website extends civicrm_handler_field_location {
     );
   }
 
-  function join_website($join = array()) {
+  public function join_website($join = array()) {
     $extra = array();
     if (isset($join->extra)) {
       $extra = $join->extra;
@@ -82,26 +82,28 @@ class civicrm_handler_field_website extends civicrm_handler_field_location {
     return $join;
   }
 
-  function get_join() {
+  public function get_join() {
     $join = parent::get_join();
     $join = $this->join_website($join);
     return $join;
   }
 
-  function ensure_my_table() {
+  public function ensure_my_table() {
     if (!isset($this->table_alias)) {
       if (!method_exists($this->query, 'ensure_table')) {
         vpr_trace();
         exit;
       }
       $join = $this->get_join();
-      if (empty($this->relationship)) { //https://www.drupal.org/node/2617032
+      if (empty($this->relationship)) {
+        //https://www.drupal.org/node/2617032
         $this->table_alias = $this->query->add_table($this->table, $this->relationship, $join);
-      } else {
+      }
+      else {
         $this->table_alias = $this->query->ensure_table($this->table, $this->relationship, $join);
       }
     }
     return $this->table_alias;
   }
-}
 
+}

From bab2a0989e0ce435d158656c9b6cf50ad8f87037 Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Sat, 16 Sep 2017 12:04:12 +1000
Subject: [PATCH 24/86] Run Civilint against first half of
 civicrm_handler_field files

---
 .../views/civicrm/civicrm_handler_field.inc   | 12 +++---
 .../civicrm_handler_field_activity.inc        | 14 +++---
 .../civicrm/civicrm_handler_field_address.inc | 21 ++++-----
 .../civicrm_handler_field_component.inc       |  7 ++-
 .../civicrm_handler_field_contact_image.inc   |  8 ++--
 .../civicrm_handler_field_contact_link.inc    | 16 +++----
 .../civicrm/civicrm_handler_field_country.inc | 14 +++---
 .../civicrm/civicrm_handler_field_county.inc  | 14 +++---
 .../civicrm/civicrm_handler_field_custom.inc  | 13 +++---
 .../civicrm_handler_field_custom_file.inc     | 29 ++++++-------
 .../civicrm_handler_field_datetime.inc        | 22 +++++-----
 .../civicrm_handler_field_drupalid.inc        |  9 ++--
 .../civicrm/civicrm_handler_field_email.inc   | 15 +++----
 ...civicrm_handler_field_encounter_medium.inc | 10 ++---
 .../civicrm/civicrm_handler_field_event.inc   | 10 ++---
 .../civicrm_handler_field_event_link.inc      | 24 +++++------
 .../civicrm/civicrm_handler_field_file.inc    | 43 +++++++++----------
 .../civicrm/civicrm_handler_field_im.inc      | 22 +++++-----
 .../civicrm_handler_field_link_activity.inc   | 17 ++++----
 .../civicrm_handler_field_link_contact.inc    | 25 +++++------
 ...ivicrm_handler_field_link_contribution.inc | 25 ++++++-----
 .../civicrm_handler_field_link_delete.inc     | 14 +++---
 22 files changed, 190 insertions(+), 194 deletions(-)

diff --git a/modules/views/civicrm/civicrm_handler_field.inc b/modules/views/civicrm/civicrm_handler_field.inc
index f4e697b..c592fd5 100644
--- a/modules/views/civicrm/civicrm_handler_field.inc
+++ b/modules/views/civicrm/civicrm_handler_field.inc
@@ -21,7 +21,7 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  * Field handler to provide simple renderer that allows linking to a user.
@@ -33,14 +33,14 @@ class civicrm_handler_field extends views_handler_field {
   /**
    * Override init function to provide generic option to link to user.
    */
-  function init(&$view, &$data) {
+  public function init(&$view, &$data) {
     parent::init($view, $data);
   }
 
   /**
    * Provide link to node option
    */
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
     $form['link_to_civicrm'] = array(
       '#title' => t('Link this field to its user'),
@@ -49,7 +49,7 @@ class civicrm_handler_field extends views_handler_field {
     );
   }
 
-  function render_link($data, $values) {
+  public function render_link($data, $values) {
     $data = str_replace('
', ', ', trim($data, '
'));
     if (!empty($this->options['link_to_civicrm']) && user_access('access CiviCRM') && $values->id) {
       return civicrm_views_href($data,
@@ -62,8 +62,8 @@ class civicrm_handler_field extends views_handler_field {
     }
   }
 
-  function render($values) {
+  public function render($values) {
     return $this->render_link(check_plain($values->{$this->field_alias}), $values);
   }
-}
 
+}
diff --git a/modules/views/civicrm/civicrm_handler_field_activity.inc b/modules/views/civicrm/civicrm_handler_field_activity.inc
index bf4109b..9c88027 100644
--- a/modules/views/civicrm/civicrm_handler_field_activity.inc
+++ b/modules/views/civicrm/civicrm_handler_field_activity.inc
@@ -21,7 +21,7 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  * Field handler for activity contact field
@@ -30,7 +30,7 @@
  */
 class civicrm_handler_field_activity extends civicrm_handler_field {
   static $_recordType;
-  function construct() {
+  public function construct() {
     parent::construct();
     if (!self::$_recordType) {
       if (!civicrm_initialize()) {
@@ -40,13 +40,13 @@ class civicrm_handler_field_activity extends civicrm_handler_field {
     }
   }
 
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
     $options['record_type'] = array('default' => 0);
     return $options;
   }
 
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
     $recordTypes = array(0 => 'Any');
     foreach (self::$_recordType as $id => $type) {
@@ -65,7 +65,7 @@ class civicrm_handler_field_activity extends civicrm_handler_field {
   /**
    * Called to link activity contact with civicrm_contact in a query.
    */
-  function query() {
+  public function query() {
 
     // Figure out what base table
     $table_data        = views_fetch_data($this->definition['base']);
@@ -90,7 +90,7 @@ class civicrm_handler_field_activity extends civicrm_handler_field {
     }
 
     if (!empty($def['join_handler']) && class_exists($def['join_handler'])) {
-      $join = new $def['join_handler'];
+      $join = new $def['join_handler']();
     }
     else {
       $join = new views_join();
@@ -115,5 +115,5 @@ class civicrm_handler_field_activity extends civicrm_handler_field {
 
     $this->alias = $this->query->add_relationship($alias, $join, $this->definition['base'], $this->relationship);
   }
-}
 
+}
diff --git a/modules/views/civicrm/civicrm_handler_field_address.inc b/modules/views/civicrm/civicrm_handler_field_address.inc
index 8151740..f5ab8c7 100644
--- a/modules/views/civicrm/civicrm_handler_field_address.inc
+++ b/modules/views/civicrm/civicrm_handler_field_address.inc
@@ -21,7 +21,7 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  * Generic field handler for address and location fields
@@ -30,13 +30,13 @@
  */
 class civicrm_handler_field_address extends civicrm_handler_field_location {
 
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
     $options['is_billing'] = array('default' => 0);
     return $options;
   }
 
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
     $form['is_billing'] = array(
       '#type' => 'checkbox',
@@ -48,7 +48,7 @@ class civicrm_handler_field_address extends civicrm_handler_field_location {
     );
   }
 
-  function join_address($join = array()) {
+  public function join_address($join = array()) {
     $extra = array();
     if (isset($join->extra)) {
       $extra = $join->extra;
@@ -67,27 +67,28 @@ class civicrm_handler_field_address extends civicrm_handler_field_location {
     return $join;
   }
 
-  function get_join() {
+  public function get_join() {
     $join = parent::get_join();
     $join = $this->join_address($join);
     return $join;
   }
 
-  function ensure_my_table() {
+  public function ensure_my_table() {
     if (!isset($this->table_alias)) {
       if (!method_exists($this->query, 'ensure_table')) {
         vpr_trace();
         exit;
       }
       $join = $this->get_join();
-      if (empty($this->relationship)) { //https://www.drupal.org/node/2617032
+      if (empty($this->relationship)) {
+        //https://www.drupal.org/node/2617032
         $this->table_alias = $this->query->add_table($this->table, $this->relationship, $join);
-      } else {
+      }
+      else {
         $this->table_alias = $this->query->ensure_table($this->table, $this->relationship, $join);
       }
     }
     return $this->table_alias;
   }
-}
-
 
+}
diff --git a/modules/views/civicrm/civicrm_handler_field_component.inc b/modules/views/civicrm/civicrm_handler_field_component.inc
index b9cfcf9..385d462 100644
--- a/modules/views/civicrm/civicrm_handler_field_component.inc
+++ b/modules/views/civicrm/civicrm_handler_field_component.inc
@@ -21,7 +21,7 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  * Field handler to provide a human-readable CiviCRM component name
@@ -29,10 +29,9 @@
  * @ingroup civicrm_field_handlers
  */
 class civicrm_handler_field_component extends views_handler_field {
-  function render($values) {
+  public function render($values) {
     $value = $this->get_value($values);
     return CRM_Core_Component::getComponentName($value);
   }
-}
-
 
+}
diff --git a/modules/views/civicrm/civicrm_handler_field_contact_image.inc b/modules/views/civicrm/civicrm_handler_field_contact_image.inc
index 5eb412c..8315bef 100644
--- a/modules/views/civicrm/civicrm_handler_field_contact_image.inc
+++ b/modules/views/civicrm/civicrm_handler_field_contact_image.inc
@@ -1,7 +1,7 @@
 <?php
 
 class civicrm_handler_field_contact_image extends views_handler_field {
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
     $options['url_only'] = array(
       'default' => FALSE,
@@ -28,7 +28,7 @@ class civicrm_handler_field_contact_image extends views_handler_field {
     return $options;
   }
 
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
     $directory = $this->get_civi_relative_upload_path();
 
@@ -107,7 +107,7 @@ class civicrm_handler_field_contact_image extends views_handler_field {
     }
   }
 
-  function render($values) {
+  public function render($values) {
     $value = $this->get_value($values);
     if (empty($value)) {
       return;
@@ -142,7 +142,7 @@ class civicrm_handler_field_contact_image extends views_handler_field {
    *
    * @return bool|string
    */
-  function get_civi_relative_upload_path() {
+  public function get_civi_relative_upload_path() {
     civicrm_initialize();
     $wrapper = file_stream_wrapper_get_instance_by_uri('public://');
     $drupal_upload_path = $wrapper->getDirectoryPath();
diff --git a/modules/views/civicrm/civicrm_handler_field_contact_link.inc b/modules/views/civicrm/civicrm_handler_field_contact_link.inc
index 9e05aef..263d3e1 100644
--- a/modules/views/civicrm/civicrm_handler_field_contact_link.inc
+++ b/modules/views/civicrm/civicrm_handler_field_contact_link.inc
@@ -21,9 +21,9 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
-/*
+/**
  * Unchanged anonymous code contribution. No claim.
  *
  * civicrm_handler_field_contact_link.inc
@@ -35,12 +35,12 @@ class civicrm_handler_field_contact_link extends views_handler_field {
   /**
    * Constructor to provide additional field to add.
    */
-  function construct() {
+  public function construct() {
     parent::construct();
     $this->additional_fields['id'] = 'id';
   }
 
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
     $options['link_to_civicrm_contact'] = array('default' => FALSE);
     return $options;
@@ -49,7 +49,7 @@ class civicrm_handler_field_contact_link extends views_handler_field {
   /**
    * Provide link to node option
    */
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
     $form['link_to_civicrm_contact'] = array(
       '#title' => t('Link this field to its CiviCRM Contact'),
@@ -63,7 +63,7 @@ class civicrm_handler_field_contact_link extends views_handler_field {
    *
    * Data should be made XSS safe prior to calling this function.
    */
-  function render_link($data, $values) {
+  public function render_link($data, $values) {
     if (!empty($this->options['link_to_civicrm_contact']) && user_access('access CiviCRM') && $data !== NULL && $data !== '') {
       return civicrm_views_href($data,
         'civicrm/contact/view',
@@ -75,8 +75,8 @@ class civicrm_handler_field_contact_link extends views_handler_field {
     }
   }
 
-  function render($values) {
+  public function render($values) {
     return $this->render_link(check_plain($values->{$this->field_alias}), $values);
   }
-}
 
+}
diff --git a/modules/views/civicrm/civicrm_handler_field_country.inc b/modules/views/civicrm/civicrm_handler_field_country.inc
index 9c5adce..308a6cf 100644
--- a/modules/views/civicrm/civicrm_handler_field_country.inc
+++ b/modules/views/civicrm/civicrm_handler_field_country.inc
@@ -21,10 +21,10 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 
-/*
+/**
  * Heavily based on anonymous code contribution. No claim.
  *
  * civicrm_handler_field_country.inc
@@ -34,7 +34,7 @@
 class civicrm_handler_field_country extends civicrm_handler_field_address {
   static $_countries;
   static $_countries_full;
-  function construct() {
+  public function construct() {
     parent::construct();
     if (!self::$_countries) {
       if (!civicrm_initialize()) {
@@ -46,7 +46,7 @@ class civicrm_handler_field_country extends civicrm_handler_field_address {
     }
   }
 
-  function render($values) {
+  public function render($values) {
     $sid = $values->{$this->field_alias};
     if (empty($sid) ||
       (int ) $sid <= 0
@@ -62,13 +62,13 @@ class civicrm_handler_field_country extends civicrm_handler_field_address {
     }
   }
 
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
     $options['country_display'] = array('default' => '');
     return $options;
   }
 
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
     $form['country_display'] = array(
       '#type' => 'radios',
@@ -78,5 +78,5 @@ class civicrm_handler_field_country extends civicrm_handler_field_address {
       '#default_value' => $this->options['country_display'],
     );
   }
-}
 
+}
diff --git a/modules/views/civicrm/civicrm_handler_field_county.inc b/modules/views/civicrm/civicrm_handler_field_county.inc
index 1067e21..e8e59a6 100644
--- a/modules/views/civicrm/civicrm_handler_field_county.inc
+++ b/modules/views/civicrm/civicrm_handler_field_county.inc
@@ -21,17 +21,17 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 
-/*
+/**
  * civicrm_handler_field_county.inc
  * Displays County after grabbing the label from the database
  *
  */
 class civicrm_handler_field_county extends civicrm_handler_field_address {
   static $_counties;
-  function construct() {
+  public function construct() {
     parent::construct();
     if (!self::$_counties) {
       if (!civicrm_initialize()) {
@@ -42,7 +42,7 @@ class civicrm_handler_field_county extends civicrm_handler_field_address {
     }
   }
 
-  function render($values) {
+  public function render($values) {
     $sid = $values->{$this->field_alias};
     if (empty($sid) ||
       (int ) $sid <= 0
@@ -53,13 +53,13 @@ class civicrm_handler_field_county extends civicrm_handler_field_address {
     return self::$_counties[$values->{$this->field_alias}];
   }
 
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
     return $options;
   }
 
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
   }
-}
 
+}
diff --git a/modules/views/civicrm/civicrm_handler_field_custom.inc b/modules/views/civicrm/civicrm_handler_field_custom.inc
index b89a8cc..6fef0b9 100644
--- a/modules/views/civicrm/civicrm_handler_field_custom.inc
+++ b/modules/views/civicrm/civicrm_handler_field_custom.inc
@@ -21,7 +21,7 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  * Field handler to render a custom field with options
@@ -29,20 +29,20 @@
  * @ingroup civicrm_field_handlers
  */
 class civicrm_handler_field_custom extends views_handler_field {
-  function construct() {
+  public function construct() {
     parent::construct();
     civicrm_initialize();
   }
 
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
     $options['civicrm_custom_formatter'] = array(
-      'default' => 'label'
+      'default' => 'label',
     );
     return $options;
   }
 
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
     // Replicate Drupal UI for formatter options, but with CiviCRM
     // terminology.
@@ -57,7 +57,7 @@ class civicrm_handler_field_custom extends views_handler_field {
     );
   }
 
-  function render($values) {
+  public function render($values) {
     $value = $values->{$this->field_alias};
     switch ($this->options['civicrm_custom_formatter']) {
       case 'value':
@@ -79,4 +79,5 @@ class civicrm_handler_field_custom extends views_handler_field {
         return NULL;
     }
   }
+
 }
diff --git a/modules/views/civicrm/civicrm_handler_field_custom_file.inc b/modules/views/civicrm/civicrm_handler_field_custom_file.inc
index 5659c9d..2ada172 100644
--- a/modules/views/civicrm/civicrm_handler_field_custom_file.inc
+++ b/modules/views/civicrm/civicrm_handler_field_custom_file.inc
@@ -21,7 +21,7 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /*
    / * Unchanged anonymous code contribution. No claim.
@@ -37,13 +37,13 @@
  * @ingroup civicrm_field_handlers
  */
 class civicrm_handler_field_custom_file extends views_handler_field {
-  function construct() {
+  public function construct() {
     parent::construct();
     civicrm_initialize();
     $this->additional_fields['entity_id'] = 'entity_id';
   }
 
-  function render($values) {
+  public function render($values) {
     $value = $values->{$this->field_alias};
     if (!is_null($value)) {
       $path = 'civicrm/file';
@@ -59,20 +59,19 @@ class civicrm_handler_field_custom_file extends views_handler_field {
           'uri'
         );
 
-        $path = sprintf('%s/imagefile',$path);
+        $path = sprintf('%s/imagefile', $path);
       }
-        $entityField = $this->aliases['entity_id'];
-        $url = CRM_Utils_System::url($path,
-          "id={$value}&eid={$values->$entityField}",
-          TRUE, FALSE, FALSE, TRUE
-        );
-        return CRM_Utils_System::url($path,
-          "id={$value}&eid={$values->$entityField}",
-          TRUE, FALSE, FALSE, TRUE
-        );
+      $entityField = $this->aliases['entity_id'];
+      $url = CRM_Utils_System::url($path,
+        "id={$value}&eid={$values->$entityField}",
+        TRUE, FALSE, FALSE, TRUE
+      );
+      return CRM_Utils_System::url($path,
+        "id={$value}&eid={$values->$entityField}",
+        TRUE, FALSE, FALSE, TRUE
+      );
     }
     return NULL;
   }
-}
-
 
+}
diff --git a/modules/views/civicrm/civicrm_handler_field_datetime.inc b/modules/views/civicrm/civicrm_handler_field_datetime.inc
index a9884c1..0e29a81 100644
--- a/modules/views/civicrm/civicrm_handler_field_datetime.inc
+++ b/modules/views/civicrm/civicrm_handler_field_datetime.inc
@@ -21,10 +21,10 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 
-/*
+/**
  * Unchanged anonymous code contribution. No claim.
  *
  * civicrm_handler_field_datetime.inc
@@ -33,13 +33,13 @@
  */
 class civicrm_handler_field_datetime extends views_handler_field_date {
 
-  /*
-     * Convert the DATETIME from the database into unixtime then allow
-     * views_handler_field_date to render as usual.
-     * Also trick php into thinking the time is in the same timezone, no
-     * matter the default timezone
-     */
-  function render($values) {
+  /**
+   * Convert the DATETIME from the database into unixtime then allow
+   * views_handler_field_date to render as usual.
+   * Also trick php into thinking the time is in the same timezone, no
+   * matter the default timezone
+   */
+  public function render($values) {
     $value = $values->{$this->field_alias};
 
     if (is_string($value) && strpos($value, "-")) {
@@ -52,7 +52,5 @@ class civicrm_handler_field_datetime extends views_handler_field_date {
 
     return parent::render($values);
   }
-}
-
-
 
+}
diff --git a/modules/views/civicrm/civicrm_handler_field_drupalid.inc b/modules/views/civicrm/civicrm_handler_field_drupalid.inc
index 199002f..09e71d5 100644
--- a/modules/views/civicrm/civicrm_handler_field_drupalid.inc
+++ b/modules/views/civicrm/civicrm_handler_field_drupalid.inc
@@ -21,7 +21,7 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  * Field handler to provide relationship to Drupal User ID
@@ -29,7 +29,7 @@
  * @ingroup civicrm_field_handlers
  */
 class civicrm_handler_field_drupalid extends views_handler_field {
-  function construct() {
+  public function construct() {
     parent::construct();
     if (!civicrm_initialize()) {
       return;
@@ -37,11 +37,10 @@ class civicrm_handler_field_drupalid extends views_handler_field {
     require_once 'CRM/Core/BAO/UFMatch.php';
   }
 
-  function render($values) {
+  public function render($values) {
     $cid = $values->{$this->field_alias};
     $uf_id = CRM_Core_BAO_UFMatch::getUFId($cid);
     return $uf_id;
   }
-}
-
 
+}
diff --git a/modules/views/civicrm/civicrm_handler_field_email.inc b/modules/views/civicrm/civicrm_handler_field_email.inc
index f285dfb..5319f54 100644
--- a/modules/views/civicrm/civicrm_handler_field_email.inc
+++ b/modules/views/civicrm/civicrm_handler_field_email.inc
@@ -21,9 +21,9 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
-/*
+/**
  * Unchanged anonymous code contribution. No claim.
  *
  * civicrm_handler_field_email.inc
@@ -37,13 +37,13 @@
  * @ingroup civicrm_field_handlers
  */
 class civicrm_handler_field_email extends civicrm_handler_field_location {
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
     $options['link_to_user'] = array('default' => 'mailto');
     return $options;
   }
 
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
     $form['link_to_user'] = array(
       '#title' => t('Link this field'),
@@ -56,16 +56,15 @@ class civicrm_handler_field_email extends civicrm_handler_field_location {
     );
   }
 
-  function render($values) {
+  public function render($values) {
     if ($this->options['link_to_user'] == 'mailto') {
       return l($values->{$this->field_alias}, "mailto:" . $values->{$this->field_alias});
     }
     return check_plain($values->{$this->field_alias});
   }
 
-  function render_link($input, $values) {
+  public function render_link($input, $values) {
     return $input;
   }
-}
-
 
+}
diff --git a/modules/views/civicrm/civicrm_handler_field_encounter_medium.inc b/modules/views/civicrm/civicrm_handler_field_encounter_medium.inc
index fd3acb3..9309430 100644
--- a/modules/views/civicrm/civicrm_handler_field_encounter_medium.inc
+++ b/modules/views/civicrm/civicrm_handler_field_encounter_medium.inc
@@ -21,9 +21,9 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
-/*
+/**
  * Heavily based on anonymous code contribution. No claim.
  *
  * civicrm_handler_field_event_type.inc
@@ -32,7 +32,7 @@
  */
 class civicrm_handler_field_encounter_medium extends views_handler_field {
   static $_encounter_medium;
-  function construct() {
+  public function construct() {
     parent::construct();
     if (!self::$_encounter_medium) {
       if (!civicrm_initialize()) {
@@ -43,7 +43,7 @@ class civicrm_handler_field_encounter_medium extends views_handler_field {
     }
   }
 
-  function render($values) {
+  public function render($values) {
     $sid = $values->{$this->field_alias};
     if (empty($sid) ||
       (int ) $sid <= 0
@@ -52,5 +52,5 @@ class civicrm_handler_field_encounter_medium extends views_handler_field {
     }
     return self::$_encounter_medium[$values->{$this->field_alias}];
   }
-}
 
+}
diff --git a/modules/views/civicrm/civicrm_handler_field_event.inc b/modules/views/civicrm/civicrm_handler_field_event.inc
index 2f92690..72ce8e8 100644
--- a/modules/views/civicrm/civicrm_handler_field_event.inc
+++ b/modules/views/civicrm/civicrm_handler_field_event.inc
@@ -21,7 +21,7 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  * Field handler for events to provide simple renderer that allows linking
@@ -34,7 +34,7 @@ class civicrm_handler_field_event extends views_handler_field_markup {
   /**
    * Provide link to node option
    */
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
     $form['link_to_event'] = array(
       '#title' => t('Link this field to its event page'),
@@ -43,7 +43,7 @@ class civicrm_handler_field_event extends views_handler_field_markup {
     );
   }
 
-  function render_link($data, $values) {
+  public function render_link($data, $values) {
     if (!empty($this->options['link_to_event']) && user_access('view event info') && $values->id) {
       return civicrm_views_href($data,
         'civicrm/event/info',
@@ -55,9 +55,9 @@ class civicrm_handler_field_event extends views_handler_field_markup {
     }
   }
 
-  function render($values) {
+  public function render($values) {
     $format = is_numeric($this->format) ? $this->format : $values->{$this->aliases['format']};
     return $this->render_link(check_markup($values->{$this->field_alias}, $format, FALSE), $values);
   }
-}
 
+}
diff --git a/modules/views/civicrm/civicrm_handler_field_event_link.inc b/modules/views/civicrm/civicrm_handler_field_event_link.inc
index f9f900f..917ebf9 100644
--- a/modules/views/civicrm/civicrm_handler_field_event_link.inc
+++ b/modules/views/civicrm/civicrm_handler_field_event_link.inc
@@ -21,9 +21,9 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
-/*
+/**
  * Heavily based on anonymous code contribution. No claim.
  *
  * civicrm_handler_field_event_link.inc
@@ -39,12 +39,12 @@ class civicrm_handler_field_event_link extends views_handler_field {
   /**
    * Constructor to provide additional field to add.
    */
-  function construct() {
+  public function construct() {
     parent::construct();
     $this->additional_fields['id'] = 'id';
   }
 
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
     $options['link_to_civicrm_event'] = array('default' => 'none');
     $options['custom_link'] = array('default' => '');
@@ -54,13 +54,13 @@ class civicrm_handler_field_event_link extends views_handler_field {
   /**
    * Provide link to node option
    */
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
     $form['link_to_civicrm_event'] = array(
       '#type' => 'select',
       '#title' => t('Choose where to link this field'),
       '#options' => array(
-        'none' => t('Don\'t Link this Field'),
+        'none' => t("Don't Link this Field"),
         'page' => t('Link to Event Page'),
         'registration' => t('Link to Event Registration'),
         'config' => t('Link to Event Configuration'),
@@ -84,7 +84,7 @@ class civicrm_handler_field_event_link extends views_handler_field {
    *
    * Data should be made XSS safe prior to calling this function.
    */
-  function render_link($data, $values) {
+  public function render_link($data, $values) {
 
     $link_choice = $this->options['link_to_civicrm_event'];
 
@@ -93,7 +93,6 @@ class civicrm_handler_field_event_link extends views_handler_field {
       $custom_link = $this->options['custom_link'];
     }
 
-
     switch ($link_choice) {
 
       // LINKING TO EVENT PAGE (PUBLICLY ACCESSIBLE)
@@ -109,10 +108,9 @@ class civicrm_handler_field_event_link extends views_handler_field {
         // LINKING TO EVENT REGISTRATION PAGE
       case 'registration':
         if (user_access('register for events') && $data !== NULL && $data !== '') {
-       require_once 'CRM/Core/Config.php';
+          require_once 'CRM/Core/Config.php';
           $config = CRM_Core_Config::singleton();
-          if ($enable_cart =
-            CRM_Core_BAO_Setting::getItem(CRM_Core_BAO_Setting::EVENT_PREFERENCES_NAME, 'enable_cart')) {
+          if ($enable_cart = CRM_Core_BAO_Setting::getItem(CRM_Core_BAO_Setting::EVENT_PREFERENCES_NAME, 'enable_cart')) {
             require_once 'CRM/Event/Cart/BAO/EventInCart.php';
             //TODO don't call for every row
             $link = CRM_Event_Cart_BAO_EventInCart::get_registration_link($values->{$this->aliases['id']});
@@ -156,8 +154,8 @@ class civicrm_handler_field_event_link extends views_handler_field {
     }
   }
 
-  function render($values) {
+  public function render($values) {
     return $this->render_link(check_plain($values->{$this->field_alias}), $values);
   }
-}
 
+}
diff --git a/modules/views/civicrm/civicrm_handler_field_file.inc b/modules/views/civicrm/civicrm_handler_field_file.inc
index 5659c9d..3a9cc50 100644
--- a/modules/views/civicrm/civicrm_handler_field_file.inc
+++ b/modules/views/civicrm/civicrm_handler_field_file.inc
@@ -21,15 +21,15 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
-/*
-   / * Unchanged anonymous code contribution. No claim.
-   *
-   * civicrm_handler_field_custom_file.inc
-   * Displays File field uri instead of id.
-   *
-   */
+/**
+ * Unchanged anonymous code contribution. No claim.
+ *
+ * civicrm_handler_field_custom_file.inc
+ * Displays File field uri instead of id.
+ *
+ */
 
 /**
  * Field handler to provide acess control for the File field
@@ -37,13 +37,13 @@
  * @ingroup civicrm_field_handlers
  */
 class civicrm_handler_field_custom_file extends views_handler_field {
-  function construct() {
+  public function construct() {
     parent::construct();
     civicrm_initialize();
     $this->additional_fields['entity_id'] = 'entity_id';
   }
 
-  function render($values) {
+  public function render($values) {
     $value = $values->{$this->field_alias};
     if (!is_null($value)) {
       $path = 'civicrm/file';
@@ -59,20 +59,19 @@ class civicrm_handler_field_custom_file extends views_handler_field {
           'uri'
         );
 
-        $path = sprintf('%s/imagefile',$path);
+        $path = sprintf('%s/imagefile', $path);
       }
-        $entityField = $this->aliases['entity_id'];
-        $url = CRM_Utils_System::url($path,
-          "id={$value}&eid={$values->$entityField}",
-          TRUE, FALSE, FALSE, TRUE
-        );
-        return CRM_Utils_System::url($path,
-          "id={$value}&eid={$values->$entityField}",
-          TRUE, FALSE, FALSE, TRUE
-        );
+      $entityField = $this->aliases['entity_id'];
+      $url = CRM_Utils_System::url($path,
+        "id={$value}&eid={$values->$entityField}",
+        TRUE, FALSE, FALSE, TRUE
+      );
+      return CRM_Utils_System::url($path,
+        "id={$value}&eid={$values->$entityField}",
+        TRUE, FALSE, FALSE, TRUE
+      );
     }
     return NULL;
   }
-}
-
 
+}
diff --git a/modules/views/civicrm/civicrm_handler_field_im.inc b/modules/views/civicrm/civicrm_handler_field_im.inc
index 64fca06..bc9edce 100644
--- a/modules/views/civicrm/civicrm_handler_field_im.inc
+++ b/modules/views/civicrm/civicrm_handler_field_im.inc
@@ -21,7 +21,7 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  * Field handler for Instant Messaging field
@@ -31,7 +31,7 @@
 class civicrm_handler_field_im extends civicrm_handler_field_location {
   static $_provider;
 
-  function construct() {
+  public function construct() {
     parent::construct();
     if (!self::$_provider) {
       if (!civicrm_initialize()) {
@@ -41,13 +41,13 @@ class civicrm_handler_field_im extends civicrm_handler_field_location {
     }
   }
 
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
     $options['provider'] = array('default' => 0);
     return $options;
   }
 
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
     $imOptions = array(0 => 'Any');
     foreach (self::$_provider as $id => $type) {
@@ -63,7 +63,7 @@ class civicrm_handler_field_im extends civicrm_handler_field_location {
     );
   }
 
-  function join_im($join = array()) {
+  public function join_im($join = array()) {
     $extra = array();
     if (isset($join->extra)) {
       $extra = $join->extra;
@@ -82,26 +82,28 @@ class civicrm_handler_field_im extends civicrm_handler_field_location {
     return $join;
   }
 
-  function get_join() {
+  public function get_join() {
     $join = parent::get_join();
     $join = $this->join_im($join);
     return $join;
   }
 
-  function ensure_my_table() {
+  public function ensure_my_table() {
     if (!isset($this->table_alias)) {
       if (!method_exists($this->query, 'ensure_table')) {
         vpr_trace();
         exit;
       }
       $join = $this->get_join();
-      if (empty($this->relationship)) { //https://www.drupal.org/node/2617032
+      if (empty($this->relationship)) {
+        //https://www.drupal.org/node/2617032
         $this->table_alias = $this->query->add_table($this->table, $this->relationship, $join);
-      } else {
+      }
+      else {
         $this->table_alias = $this->query->ensure_table($this->table, $this->relationship, $join);
       }
     }
     return $this->table_alias;
   }
-}
 
+}
diff --git a/modules/views/civicrm/civicrm_handler_field_link_activity.inc b/modules/views/civicrm/civicrm_handler_field_link_activity.inc
index ed23cfe..7855ff9 100644
--- a/modules/views/civicrm/civicrm_handler_field_link_activity.inc
+++ b/modules/views/civicrm/civicrm_handler_field_link_activity.inc
@@ -21,7 +21,7 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /*
  * Copyright (C) 2009 James Rakich
@@ -43,13 +43,13 @@ class civicrm_handler_field_link_activity extends views_handler_field {
   /**
    * Constructor to provide additional field to add.
    */
-  function construct() {
+  public function construct() {
     parent::construct();
     $this->additional_fields['id'] = 'id';
     $this->additional_fields['activity_type_id'] = 'activity_type_id';
   }
 
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
     $options['link_to_civicrm_activity'] = array('default' => 'view');
     $options['custom_link'] = array('default' => '');
@@ -57,7 +57,7 @@ class civicrm_handler_field_link_activity extends views_handler_field {
     return $options;
   }
 
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
     $form['link_to_civicrm_activity'] = array(
       '#type' => 'select',
@@ -89,7 +89,7 @@ class civicrm_handler_field_link_activity extends views_handler_field {
     );
   }
 
-  function render_link($data, $values) {
+  public function render_link($data, $values) {
 
     $link_text = $this->options['link_text'];
     $link_choice = $this->options['link_to_civicrm_activity'];
@@ -98,7 +98,6 @@ class civicrm_handler_field_link_activity extends views_handler_field {
       $custom_link = $this->options['custom_link'];
     }
 
-
     switch ($link_choice) {
 
       // LINKING TO activity VIEW PAGE
@@ -141,13 +140,13 @@ class civicrm_handler_field_link_activity extends views_handler_field {
     }
   }
 
-  function query() {
+  public function query() {
     $this->ensure_my_table();
     $this->add_additional_fields();
   }
 
-  function render($values) {
+  public function render($values) {
     return $this->render_link(NULL, $values);
   }
-}
 
+}
diff --git a/modules/views/civicrm/civicrm_handler_field_link_contact.inc b/modules/views/civicrm/civicrm_handler_field_link_contact.inc
index 377b257..c363a8f 100644
--- a/modules/views/civicrm/civicrm_handler_field_link_contact.inc
+++ b/modules/views/civicrm/civicrm_handler_field_link_contact.inc
@@ -21,14 +21,16 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
-/*
+/**
  * Copyright (C) 2009 James Rakich
  * Licensed to CiviCRM under the Academic Free License version 3.0.
+ */
+
+/**
+ * civicrm_handler_field_link_contact
  *
- *
- * civicrm_handler_field_link_contact.inc
  * Completely customizable text that can be linked to numerous places related to the activity.
  * View, Edit and Delete Pages, as well as a custom Drupal Link with the Contact ID appended,
  * which is great for linking to other views using contact or other base tables.
@@ -43,12 +45,12 @@ class civicrm_handler_field_link_contact extends views_handler_field {
   /**
    * Constructor to provide additional field to add.
    */
-  function construct() {
+  public function construct() {
     parent::construct();
     $this->additional_fields['id'] = 'id';
   }
 
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
     $options['link_to_civicrm_contact'] = array('default' => 'view');
     $options['custom_link'] = array('default' => '');
@@ -56,7 +58,7 @@ class civicrm_handler_field_link_contact extends views_handler_field {
     return $options;
   }
 
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
     $form['link_to_civicrm_contact'] = array(
       '#type' => 'select',
@@ -88,14 +90,13 @@ class civicrm_handler_field_link_contact extends views_handler_field {
     );
   }
 
-  function render_link($data, $values) {
+  public function render_link($data, $values) {
     $link_text = $this->options['link_text'];
     $link_choice = $this->options['link_to_civicrm_contact'];
     if ($link_choice == 'custom') {
       $custom_link = $this->options['custom_link'];
     }
 
-
     switch ($link_choice) {
 
       // LINKING TO CONTACT VIEW PAGE
@@ -137,13 +138,13 @@ class civicrm_handler_field_link_contact extends views_handler_field {
     }
   }
 
-  function query() {
+  public function query() {
     $this->ensure_my_table();
     $this->add_additional_fields();
   }
 
-  function render($values) {
+  public function render($values) {
     return $this->render_link(check_plain(property_exists($values, $this->field_alias)), $values);
   }
-}
 
+}
diff --git a/modules/views/civicrm/civicrm_handler_field_link_contribution.inc b/modules/views/civicrm/civicrm_handler_field_link_contribution.inc
index 421711a..1c79903 100644
--- a/modules/views/civicrm/civicrm_handler_field_link_contribution.inc
+++ b/modules/views/civicrm/civicrm_handler_field_link_contribution.inc
@@ -21,18 +21,18 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
-/*
+/**
  * Copyright (C) 2009 James Rakich
  * Licensed to CiviCRM under the Academic Free License version 3.0.
- *
- *
+ */
+
+/**
  * civicrm_handler_field_link_contribution.inc
  * Completely customizable text that can be linked to numerous places related to the contribution.
  * View, Edit and Delete Pages, as well as a custom Drupal Link with the activity ID appended,
  * which is great for linking to other views using the contribution base table.
- *
  */
 
 /**
@@ -43,13 +43,13 @@ class civicrm_handler_field_link_contribution extends views_handler_field {
   /**
    * Constructor to provide additional field to add.
    */
-  function construct() {
+  public function construct() {
     parent::construct();
     $this->additional_fields['contact_id'] = 'contact_id';
     $this->additional_fields['id'] = 'id';
   }
 
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
     $options['link_to_civicrm_contribution'] = array('default' => 'view');
     $options['custom_link'] = array('default' => '');
@@ -57,7 +57,7 @@ class civicrm_handler_field_link_contribution extends views_handler_field {
     return $options;
   }
 
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
     $form['link_to_civicrm_contribution'] = array(
       '#type' => 'select',
@@ -89,7 +89,7 @@ class civicrm_handler_field_link_contribution extends views_handler_field {
     );
   }
 
-  function render_link($data, $values) {
+  public function render_link($data, $values) {
 
     $link_text = $this->options['link_text'];
     $link_choice = $this->options['link_to_civicrm_contribution'];
@@ -98,7 +98,6 @@ class civicrm_handler_field_link_contribution extends views_handler_field {
       $custom_link = $this->options['custom_link'];
     }
 
-
     switch ($link_choice) {
 
       // LINKING TO CONTRIBUTION VIEW PAGE
@@ -141,13 +140,13 @@ class civicrm_handler_field_link_contribution extends views_handler_field {
     }
   }
 
-  function query() {
+  public function query() {
     $this->ensure_my_table();
     $this->add_additional_fields();
   }
 
-  function render($values) {
+  public function render($values) {
     return $this->render_link(NULL, $values);
   }
-}
 
+}
diff --git a/modules/views/civicrm/civicrm_handler_field_link_delete.inc b/modules/views/civicrm/civicrm_handler_field_link_delete.inc
index d0baca6..e9c9251 100644
--- a/modules/views/civicrm/civicrm_handler_field_link_delete.inc
+++ b/modules/views/civicrm/civicrm_handler_field_link_delete.inc
@@ -21,7 +21,7 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  * Field handler to present a link to user delete.
@@ -29,12 +29,15 @@
  * @ingroup civicrm_field_handlers
  */
 class civicrm_handler_field_link_delete extends civicrm_handler_field_link {
-  // An example of field level access control.
-  function access() {
+
+  /**
+   * An example of field level access control.
+   */
+  public function access() {
     return user_access('access CiviCRM');
   }
 
-  function render($values) {
+  public function render($values) {
     $text = !empty($this->options['text']) ? $this->options['text'] : t('delete');
     $id = $values->{$this->aliases['id']};
     return civicrm_views_href($text,
@@ -42,6 +45,5 @@ class civicrm_handler_field_link_delete extends civicrm_handler_field_link {
       "reset=1&id=$id"
     );
   }
-}
-
 
+}

From e9656a81eb692462a73252bf820d6b975b2e7430 Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Sat, 16 Sep 2017 12:26:09 +1000
Subject: [PATCH 25/86] Civilint 2nd half of civicrm_handler_field files

---
 .../civicrm/civicrm_handler_field_link.inc    | 21 ++++++-----
 .../civicrm_handler_field_link_edit.inc       | 13 ++++---
 .../civicrm_handler_field_link_event.inc      | 37 +++++++++----------
 ...civicrm_handler_field_link_participant.inc | 23 ++++++------
 .../civicrm_handler_field_link_pcp.inc        | 33 +++++++----------
 ...ivicrm_handler_field_link_relationship.inc | 18 ++++-----
 .../civicrm_handler_field_location.inc        | 25 +++++++------
 .../civicrm/civicrm_handler_field_mail.inc    | 11 +++---
 .../civicrm/civicrm_handler_field_markup.inc  | 12 +++---
 .../civicrm/civicrm_handler_field_money.inc   | 19 +++++-----
 .../civicrm/civicrm_handler_field_option.inc  | 11 ++----
 ...ivicrm_handler_field_pcp_raised_amount.inc |  9 ++---
 .../civicrm/civicrm_handler_field_phone.inc   | 22 ++++++-----
 .../civicrm_handler_field_pseudo_constant.inc | 11 +++---
 ...ivicrm_handler_field_relationship_type.inc | 15 +++-----
 .../civicrm/civicrm_handler_field_state.inc   | 22 +++++------
 16 files changed, 145 insertions(+), 157 deletions(-)

diff --git a/modules/views/civicrm/civicrm_handler_field_link.inc b/modules/views/civicrm/civicrm_handler_field_link.inc
index e176d45..f77269a 100644
--- a/modules/views/civicrm/civicrm_handler_field_link.inc
+++ b/modules/views/civicrm/civicrm_handler_field_link.inc
@@ -21,7 +21,7 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  * Field handler to present a link to the user.
@@ -29,18 +29,18 @@
  * @ingroup civicrm_field_handlers
  */
 class civicrm_handler_field_link extends civicrm_handler_field {
-  function construct() {
+  public function construct() {
     parent::construct();
     $this->additional_fields['id'] = 'id';
   }
 
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
     $options['text'] = array('default' => '', 'translatable' => TRUE);
     return $options;
   }
 
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
     $form['text'] = array(
       '#type' => 'textfield',
@@ -49,21 +49,22 @@ class civicrm_handler_field_link extends civicrm_handler_field {
     );
   }
 
-  // An example of field level access control.
-  function access() {
+  /**
+   * An example of field level access control.
+   */
+  public function access() {
     return user_access('access CiviCRM');
   }
 
-  function query() {
+  public function query() {
     $this->ensure_my_table();
     $this->add_additional_fields();
   }
 
-  function render($values) {
+  public function render($values) {
     $text = !empty($this->options['text']) ? $this->options['text'] : t('view');
     $id = $values->{$this->aliases['id']};
     return civicrm_views_href($text, "civicrm/contact/view", "reset=1&id=$id");
   }
-}
-
 
+}
diff --git a/modules/views/civicrm/civicrm_handler_field_link_edit.inc b/modules/views/civicrm/civicrm_handler_field_link_edit.inc
index be085a1..134a4e7 100644
--- a/modules/views/civicrm/civicrm_handler_field_link_edit.inc
+++ b/modules/views/civicrm/civicrm_handler_field_link_edit.inc
@@ -21,7 +21,7 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  * Field handler to present a link to user edit.
@@ -29,12 +29,14 @@
  * @ingroup civicrm_field_handlers
  */
 class civicrm_handler_field_link_edit extends civicrm_handler_field_link {
-  // An example of field level access control.
-  function access() {
+  /**
+   * An example of field level access control.
+   */
+  public function access() {
     return user_access('access CiviCRM');
   }
 
-  function render($values) {
+  public function render($values) {
     $text = !empty($this->options['text']) ? $this->options['text'] : t('edit');
     $id = $values->id;
     return civicrm_views_href($text,
@@ -42,6 +44,5 @@ class civicrm_handler_field_link_edit extends civicrm_handler_field_link {
       "reset=1&action=update&cid=$id"
     );
   }
-}
-
 
+}
diff --git a/modules/views/civicrm/civicrm_handler_field_link_event.inc b/modules/views/civicrm/civicrm_handler_field_link_event.inc
index e96a2fb..f06ae77 100644
--- a/modules/views/civicrm/civicrm_handler_field_link_event.inc
+++ b/modules/views/civicrm/civicrm_handler_field_link_event.inc
@@ -21,19 +21,19 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /*
-   * Copyright (C) 2009 James Rakich
-   * Licensed to CiviCRM under the Academic Free License version 3.0.
-   *
-   *
-   * civicrm_handler_field_link_event.inc
-   * Completely customizable text that can be linked to numerous places related to the event.
-   * Info, Register, Config etc pages, as well as a custom Drupal Link with the Event ID appended,
-   * which is great for linking to other views using the event or participant base table.
-   *
-   */
+ * Copyright (C) 2009 James Rakich
+ * Licensed to CiviCRM under the Academic Free License version 3.0.
+ */
+
+/**
+ * civicrm_handler_field_link_event.inc
+ * Completely customizable text that can be linked to numerous places related to the event.
+ * Info, Register, Config etc pages, as well as a custom Drupal Link with the Event ID appended,
+ * which is great for linking to other views using the event or participant base table.
+ */
 
 /**
  * Field handler to provide simple renderer that allows linking to various pages involving the event.
@@ -43,12 +43,12 @@ class civicrm_handler_field_link_event extends views_handler_field {
   /**
    * Constructor to provide additional field to add.
    */
-  function construct() {
+  public function construct() {
     parent::construct();
     $this->additional_fields['id'] = 'id';
   }
 
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
     $options['link_to_civicrm_event'] = array('default' => 'view');
     $options['custom_link'] = array('default' => '');
@@ -56,7 +56,7 @@ class civicrm_handler_field_link_event extends views_handler_field {
     return $options;
   }
 
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
     $form['link_to_civicrm_event'] = array(
       '#type' => 'select',
@@ -91,7 +91,7 @@ class civicrm_handler_field_link_event extends views_handler_field {
     );
   }
 
-  function render_link($data, $values) {
+  public function render_link($data, $values) {
 
     $link_text = $this->options['link_text'];
     $link_choice = $this->options['link_to_civicrm_event'];
@@ -100,7 +100,6 @@ class civicrm_handler_field_link_event extends views_handler_field {
       $custom_link = $this->options['custom_link'];
     }
 
-
     switch ($link_choice) {
 
       // LINKING TO EVENT INFO
@@ -170,13 +169,13 @@ class civicrm_handler_field_link_event extends views_handler_field {
     }
   }
 
-  function query() {
+  public function query() {
     $this->ensure_my_table();
     $this->add_additional_fields();
   }
 
-  function render($values) {
+  public function render($values) {
     return $this->render_link(NULL, $values);
   }
-}
 
+}
diff --git a/modules/views/civicrm/civicrm_handler_field_link_participant.inc b/modules/views/civicrm/civicrm_handler_field_link_participant.inc
index a434731..26e7a8d 100644
--- a/modules/views/civicrm/civicrm_handler_field_link_participant.inc
+++ b/modules/views/civicrm/civicrm_handler_field_link_participant.inc
@@ -21,13 +21,14 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /*
  * Copyright (C) 2009 James Rakich
  * Licensed to CiviCRM under the Academic Free License version 3.0.
- *
- *
+ */
+
+/**
  * civicrm_handler_field_link_participant.inc
  * Completely customizable text that can be linked to numerous places related to the participant.
  * View, Edit and Delete Pages, as well as a custom Drupal Link with the participant ID appended,
@@ -43,18 +44,18 @@ class civicrm_handler_field_link_participant extends views_handler_field {
   /**
    * Constructor to provide additional field to add.
    */
-  function construct() {
+  public function construct() {
     parent::construct();
     $this->additional_fields['contact_id'] = array('table' => 'civicrm_participant', 'field' => 'contact_id');
     $this->additional_fields['id'] = 'id';
   }
 
-  function query() {
+  public function query() {
     $this->ensure_my_table();
     $this->add_additional_fields();
   }
 
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
     $options['link_to_civicrm_participant'] = array('default' => 'view');
     $options['custom_link'] = array('default' => '');
@@ -62,7 +63,7 @@ class civicrm_handler_field_link_participant extends views_handler_field {
     return $options;
   }
 
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
     $form['link_to_civicrm_participant'] = array(
       '#type' => 'select',
@@ -94,7 +95,7 @@ class civicrm_handler_field_link_participant extends views_handler_field {
     );
   }
 
-  function render_link($data, $values) {
+  public function render_link($data, $values) {
 
     $link_text = $this->options['link_text'];
     $link_choice = $this->options['link_to_civicrm_participant'];
@@ -103,11 +104,9 @@ class civicrm_handler_field_link_participant extends views_handler_field {
       $custom_link = $this->options['custom_link'];
     }
 
-
     switch ($link_choice) {
 
       // LINKING TO PARTICIPANT VIEW PAGE
-
       case 'view':
         if (user_access('edit event participants') && $link_text !== NULL && $link_text !== '') {
           return civicrm_views_href($link_text,
@@ -146,8 +145,8 @@ class civicrm_handler_field_link_participant extends views_handler_field {
     }
   }
 
-  function render($values) {
+  public function render($values) {
     return $this->render_link(NULL, $values);
   }
-}
 
+}
diff --git a/modules/views/civicrm/civicrm_handler_field_link_pcp.inc b/modules/views/civicrm/civicrm_handler_field_link_pcp.inc
index fe31410..4675ad8 100644
--- a/modules/views/civicrm/civicrm_handler_field_link_pcp.inc
+++ b/modules/views/civicrm/civicrm_handler_field_link_pcp.inc
@@ -21,7 +21,7 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 
 /*
@@ -41,19 +41,19 @@ class civicrm_handler_field_link_pcp extends views_handler_field {
   /**
    * Constructor to provide additional field to add.
    */
-  function construct() {
+  public function construct() {
     parent::construct();
     $this->additional_fields['id'] = 'id';
     $this->additional_fields['page_id'] = 'page_id';
   }
 
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
     $options['link_to_civicrm_pcp'] = array('default' => 'view');
     return $options;
   }
 
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
     $form['link_to_civicrm_pcp'] = array(
       '#type' => 'select',
@@ -66,18 +66,15 @@ class civicrm_handler_field_link_pcp extends views_handler_field {
     );
   }
 
-  function render_link($data, $values) {
+  public function render_link($data, $values) {
 
     $link_choice = $this->options['link_to_civicrm_pcp'];
 
     switch ($link_choice) {
 
-      /*
-     * LINKING TO PCP VIEW PAGE - this provides a URL for users to use however they like in their view
-     * (e.g., exclude this field from view and output the Title of the PCP as a link, using Views'
-     * replacement patterns to supply the link path
-     */
-
+      // LINKING TO PCP VIEW PAGE - this provides a URL for users to use however they like in their view
+      // (e.g., exclude this field from view and output the Title of the PCP as a link, using Views'
+      // replacement patterns to supply the link path
       case 'view':
         // why bother displaying PCP pages if the user can't follow through with a donation?
         if (user_access('make online contributions')) {
@@ -89,11 +86,9 @@ class civicrm_handler_field_link_pcp extends views_handler_field {
           );
         }
 
-        /*
-     * LINKING TO PCP CONTRIBUTION PAGE - this provides a URL for users to use however they like in their view
-     * (e.g., exclude this field from view and output the Text For Donate Link of the PCP as a link, using Views'
-     * replacement patterns to supply the link path
-     */
+        // LINKING TO PCP CONTRIBUTION PAGE - this provides a URL for users to use however they like in their view
+        // (e.g., exclude this field from view and output the Text For Donate Link of the PCP as a link, using Views'
+        // replacement patterns to supply the link path
       case 'contribute':
         if (user_access('make online contributions')) {
           return civicrm_views_url(
@@ -106,13 +101,13 @@ class civicrm_handler_field_link_pcp extends views_handler_field {
     }
   }
 
-  function query() {
+  public function query() {
     $this->ensure_my_table();
     $this->add_additional_fields();
   }
 
-  function render($values) {
+  public function render($values) {
     return $this->render_link(check_plain($values->{$this->field_alias}), $values);
   }
-}
 
+}
diff --git a/modules/views/civicrm/civicrm_handler_field_link_relationship.inc b/modules/views/civicrm/civicrm_handler_field_link_relationship.inc
index 9183cb9..87d02a9 100644
--- a/modules/views/civicrm/civicrm_handler_field_link_relationship.inc
+++ b/modules/views/civicrm/civicrm_handler_field_link_relationship.inc
@@ -21,7 +21,7 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /*
  * Copyright (C) 2009 James Rakich, minor changes by Danila Deliya.
@@ -43,14 +43,14 @@ class civicrm_handler_field_link_relationship extends views_handler_field {
   /**
    * Constructor to provide additional field to add.
    */
-  function construct() {
+  public function construct() {
     parent::construct();
     $this->additional_fields['contact_id_a'] = 'contact_id_a';
     $this->additional_fields['contact_id_b'] = 'contact_id_b';
     $this->additional_fields['id'] = 'id';
   }
 
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
     $options['link_to_civicrm_relationship'] = array('default' => 'view');
     $options['custom_link'] = array('default' => '');
@@ -58,7 +58,7 @@ class civicrm_handler_field_link_relationship extends views_handler_field {
     return $options;
   }
 
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
     $form['link_to_civicrm_relationship'] = array(
       '#type' => 'select',
@@ -92,7 +92,7 @@ class civicrm_handler_field_link_relationship extends views_handler_field {
     );
   }
 
-  function render_link($data, $values) {
+  public function render_link($data, $values) {
 
     $link_text = $this->options['link_text'];
     $link_choice = $this->options['link_to_civicrm_relationship'];
@@ -101,11 +101,9 @@ class civicrm_handler_field_link_relationship extends views_handler_field {
       $custom_link = $this->options['custom_link'];
     }
 
-
     switch ($link_choice) {
 
       // LINKING TO RELATIONSHIP VIEW PAGE
-
       case 'view_A_B':
 
         if (user_access('view all contacts') && $link_text !== NULL && $link_text !== '') {
@@ -162,13 +160,13 @@ class civicrm_handler_field_link_relationship extends views_handler_field {
     }
   }
 
-  function query() {
+  public function query() {
     $this->ensure_my_table();
     $this->add_additional_fields();
   }
 
-  function render($values) {
+  public function render($values) {
     return $this->render_link(NULL, $values);
   }
-}
 
+}
diff --git a/modules/views/civicrm/civicrm_handler_field_location.inc b/modules/views/civicrm/civicrm_handler_field_location.inc
index e497c42..9dad348 100644
--- a/modules/views/civicrm/civicrm_handler_field_location.inc
+++ b/modules/views/civicrm/civicrm_handler_field_location.inc
@@ -21,7 +21,7 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  * Generic field handler for address and location fields
@@ -33,7 +33,7 @@ class civicrm_handler_field_location extends civicrm_handler_field {
   static $_locationOps;
   static $location_op;
 
-  function construct() {
+  public function construct() {
     parent::construct();
     if (!self::$_locationTypes) {
       if (!civicrm_initialize()) {
@@ -45,7 +45,7 @@ class civicrm_handler_field_location extends civicrm_handler_field {
     }
   }
 
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
     $options['location_type'] = array('default' => 0);
     $options['location_op'] = array('default' => 0);
@@ -53,7 +53,7 @@ class civicrm_handler_field_location extends civicrm_handler_field {
     return $options;
   }
 
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
 
     $locationOptions = array(0 => 'Any');
@@ -66,7 +66,7 @@ class civicrm_handler_field_location extends civicrm_handler_field {
       '#title' => t('Label'),
       '#default_value' => $label,
       '#dependency' => array(
-          'edit-options-custom-label' => array(1),
+        'edit-options-custom-label' => array(1),
       ),
       '#weight' => -102,
     );
@@ -104,23 +104,25 @@ class civicrm_handler_field_location extends civicrm_handler_field {
     );
   }
 
-  function ensure_my_table() {
+  public function ensure_my_table() {
     if (!isset($this->table_alias)) {
       if (!method_exists($this->query, 'ensure_table')) {
         vpr_trace();
         exit;
       }
       $join = $this->get_join();
-      if (empty($this->relationship)) { //https://www.drupal.org/node/2617032
+      if (empty($this->relationship)) {
+        //https://www.drupal.org/node/2617032
         $this->table_alias = $this->query->add_table($this->table, $this->relationship, $join);
-      } else {
+      }
+      else {
         $this->table_alias = $this->query->ensure_table($this->table, $this->relationship, $join);
       }
     }
     return $this->table_alias;
   }
 
-  function location_extras() {
+  public function location_extras() {
     $extra = array();
     if (!empty($this->options['location_type'])) {
       $extra[] = array(
@@ -141,7 +143,7 @@ class civicrm_handler_field_location extends civicrm_handler_field {
     return $extra;
   }
 
-  function join_location($join = array()) {
+  public function join_location($join = array()) {
     $extra = array();
     if (isset($join->extra)) {
       $extra = $join->extra;
@@ -154,9 +156,10 @@ class civicrm_handler_field_location extends civicrm_handler_field {
     return $join;
   }
 
-  function get_join() {
+  public function get_join() {
     $join = parent::get_join();
     $join = $this->join_location($join);
     return $join;
   }
+
 }
diff --git a/modules/views/civicrm/civicrm_handler_field_mail.inc b/modules/views/civicrm/civicrm_handler_field_mail.inc
index 995dc33..e1b4834 100644
--- a/modules/views/civicrm/civicrm_handler_field_mail.inc
+++ b/modules/views/civicrm/civicrm_handler_field_mail.inc
@@ -21,7 +21,7 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  * Field handler to provide acess control for the email field
@@ -29,13 +29,13 @@
  * @ingroup civicrm_field_handlers
  */
 class civicrm_handler_field_mail extends civicrm_handler_field {
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
     $options['link_to_civicrm'] = array('default' => 'mailto');
     return $options;
   }
 
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
     $form['link_to_civicrm'] = array(
       '#title' => t('Link this field'),
@@ -49,12 +49,11 @@ class civicrm_handler_field_mail extends civicrm_handler_field {
     );
   }
 
-  function render($values) {
+  public function render($values) {
     if ($this->options['link_to_civicrm'] == 'mailto') {
       return l($values->{$this->field_alias}, "mailto:" . $values->{$this->field_alias});
     }
     return $this->render_link(check_plain($values->{$this->field_alias}), $values);
   }
-}
-
 
+}
diff --git a/modules/views/civicrm/civicrm_handler_field_markup.inc b/modules/views/civicrm/civicrm_handler_field_markup.inc
index 0e23d2c..7e71b7c 100644
--- a/modules/views/civicrm/civicrm_handler_field_markup.inc
+++ b/modules/views/civicrm/civicrm_handler_field_markup.inc
@@ -5,14 +5,14 @@
  *
  */
 class civicrm_handler_field_markup extends views_handler_field {
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
 
     $options['text_format'] = array('default' => filter_fallback_format());
     return $options;
   }
 
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
 
     $form['text_format'] = array(
@@ -23,18 +23,18 @@ class civicrm_handler_field_markup extends views_handler_field {
     );
   }
 
-  function render($values) {
+  public function render($values) {
     $value = $values->{$this->field_alias};
     $retval = check_markup($value, $this->options['text_format'], FALSE);
     return ($retval == 'n/a') ? NULL : $retval;
   }
 
-  function get_formats() {
+  public function get_formats() {
     $formats = array();
     foreach (filter_formats() as $format) {
       $formats[$format->format] = $format->name;
-}
+    }
     return $formats;
   }
-}
 
+}
diff --git a/modules/views/civicrm/civicrm_handler_field_money.inc b/modules/views/civicrm/civicrm_handler_field_money.inc
index 34d18f6..a5a7e75 100644
--- a/modules/views/civicrm/civicrm_handler_field_money.inc
+++ b/modules/views/civicrm/civicrm_handler_field_money.inc
@@ -21,7 +21,7 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  * Field handler to provide a formatted monetary string
@@ -29,7 +29,7 @@
  * @ingroup civicrm_field_handlers
  */
 class civicrm_handler_field_money extends views_handler_field {
-  function construct() {
+  public function construct() {
     parent::construct();
     if (!civicrm_initialize()) {
       return;
@@ -41,11 +41,11 @@ class civicrm_handler_field_money extends views_handler_field {
     }
   }
 
-  function render($values) {
+  public function render($values) {
     $value = $this->get_value($values);
     $currency = $this->get_value($values, 'currency');
 
-    switch ($this->options ['display_format']) {
+    switch ($this->options['display_format']) {
       case 'formatted':
         return CRM_Utils_Money::format($value, $currency);
 
@@ -54,24 +54,25 @@ class civicrm_handler_field_money extends views_handler_field {
     }
   }
 
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
 
-    $options ['display_format'] = array('default' => 'formatted');
+    $options['display_format'] = array('default' => 'formatted');
 
     return $options;
   }
 
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
-    $form ['display_format'] = array(
+    $form['display_format'] = array(
       '#type' => 'select',
       '#title' => t('Display format'),
       '#options' => array(
         'formatted' => t('Currency formatted amount ($123.45)'),
         'raw' => t('Raw amount (123.45)'),
       ),
-      '#default_value' => $this->options ['display_format'],
+      '#default_value' => $this->options['display_format'],
     );
   }
+
 }
diff --git a/modules/views/civicrm/civicrm_handler_field_option.inc b/modules/views/civicrm/civicrm_handler_field_option.inc
index 72bc5c1..7ed23c4 100644
--- a/modules/views/civicrm/civicrm_handler_field_option.inc
+++ b/modules/views/civicrm/civicrm_handler_field_option.inc
@@ -21,7 +21,7 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  * Field handler to provide acess control for an "pseudo constant / option value" pair
@@ -30,18 +30,15 @@
  */
 class civicrm_handler_field_option extends civicrm_handler_field {
   static $_options;
-  function render($values) {
+  public function render($values) {
     $this->initialize();
 
     $id = $values->{$this->field_alias};
-    if (empty($id) ||
-      (int ) $id <= 0
-    ) {
+    if (empty($id) || (int) $id <= 0) {
       return NULL;
     }
 
     return self::$_options[$values->{$this->field_alias}];
   }
-}
-
 
+}
diff --git a/modules/views/civicrm/civicrm_handler_field_pcp_raised_amount.inc b/modules/views/civicrm/civicrm_handler_field_pcp_raised_amount.inc
index 07e6812..aef390e 100644
--- a/modules/views/civicrm/civicrm_handler_field_pcp_raised_amount.inc
+++ b/modules/views/civicrm/civicrm_handler_field_pcp_raised_amount.inc
@@ -21,7 +21,7 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  * Field handler to provide amount raised by given Personal Campaign Page
@@ -29,7 +29,7 @@
  * @ingroup civicrm_field_handlers
  */
 class civicrm_handler_field_pcp_raised_amount extends views_handler_field {
-  function construct() {
+  public function construct() {
     parent::construct();
     if (!civicrm_initialize()) {
       return;
@@ -38,7 +38,7 @@ class civicrm_handler_field_pcp_raised_amount extends views_handler_field {
     require_once 'CRM/Utils/Money.php';
   }
 
-  function render($values) {
+  public function render($values) {
     // retrieve the value of the "real field"
     $pcp_id = $values->{$this->field_alias};
     // get the total amount raised
@@ -49,6 +49,5 @@ class civicrm_handler_field_pcp_raised_amount extends views_handler_field {
     }
     return CRM_Utils_Money::format($amount);
   }
-}
-
 
+}
diff --git a/modules/views/civicrm/civicrm_handler_field_phone.inc b/modules/views/civicrm/civicrm_handler_field_phone.inc
index 22aeb13..8d044bd 100644
--- a/modules/views/civicrm/civicrm_handler_field_phone.inc
+++ b/modules/views/civicrm/civicrm_handler_field_phone.inc
@@ -21,7 +21,7 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  * Field handler for phone field
@@ -31,7 +31,7 @@
 class civicrm_handler_field_phone extends civicrm_handler_field_location {
   static $_phoneType;
 
-  function construct() {
+  public function construct() {
     parent::construct();
     if (!self::$_phoneType) {
       if (!civicrm_initialize()) {
@@ -41,13 +41,13 @@ class civicrm_handler_field_phone extends civicrm_handler_field_location {
     }
   }
 
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
     $options['phone_type'] = array('default' => 0);
     return $options;
   }
 
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
     $phoneOptions = array(0 => 'Any');
     foreach (self::$_phoneType as $id => $type) {
@@ -63,7 +63,7 @@ class civicrm_handler_field_phone extends civicrm_handler_field_location {
     );
   }
 
-  function join_phone($join = array()) {
+  public function join_phone($join = array()) {
     $extra = array();
     if (isset($join->extra)) {
       $extra = $join->extra;
@@ -82,26 +82,28 @@ class civicrm_handler_field_phone extends civicrm_handler_field_location {
     return $join;
   }
 
-  function get_join() {
+  public function get_join() {
     $join = parent::get_join();
     $join = $this->join_phone($join);
     return $join;
   }
 
-  function ensure_my_table() {
+  public function ensure_my_table() {
     if (!isset($this->table_alias)) {
       if (!method_exists($this->query, 'ensure_table')) {
         vpr_trace();
         exit;
       }
       $join = $this->get_join();
-      if (empty($this->relationship)) { //https://www.drupal.org/node/2617032
+      if (empty($this->relationship)) {
+        //https://www.drupal.org/node/2617032
         $this->table_alias = $this->query->add_table($this->table, $this->relationship, $join);
-      } else {
+      }
+      else {
         $this->table_alias = $this->query->ensure_table($this->table, $this->relationship, $join);
       }
     }
     return $this->table_alias;
   }
-}
 
+}
diff --git a/modules/views/civicrm/civicrm_handler_field_pseudo_constant.inc b/modules/views/civicrm/civicrm_handler_field_pseudo_constant.inc
index 0241475..d810e85 100644
--- a/modules/views/civicrm/civicrm_handler_field_pseudo_constant.inc
+++ b/modules/views/civicrm/civicrm_handler_field_pseudo_constant.inc
@@ -21,9 +21,9 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
-/*
+/**
  * Developed by Jim Taylor.
  *
  * civicrm_handler_field_pseudo_constant.inc
@@ -33,7 +33,7 @@
 class civicrm_handler_field_pseudo_constant extends views_handler_field {
   public $_pseudo_constant;
 
-  function construct() {
+  public function construct() {
     parent::construct();
     parent::construct();
     if (!civicrm_initialize() ||
@@ -53,18 +53,17 @@ class civicrm_handler_field_pseudo_constant extends views_handler_field {
     else {
       $pseudo_args = array();
     }
-      
 
     // Include and call the Pseudo Class method
     $this->_pseudo_constant = call_user_func_array($this->definition['pseudo class'] . "::" . $this->definition['pseudo method'], $pseudo_args);
   }
 
-  function render($values) {
+  public function render($values) {
     if (!empty($values->{$this->field_alias})) {
       $val = $values->{$this->field_alias};
       $val = str_replace("\x01", '', $val); // TODO This fix should be replaced as described in  CRM-12853
       return $this->_pseudo_constant[$val];
     }
   }
-}
 
+}
diff --git a/modules/views/civicrm/civicrm_handler_field_relationship_type.inc b/modules/views/civicrm/civicrm_handler_field_relationship_type.inc
index 5ad71f2..851a306 100644
--- a/modules/views/civicrm/civicrm_handler_field_relationship_type.inc
+++ b/modules/views/civicrm/civicrm_handler_field_relationship_type.inc
@@ -21,9 +21,9 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
-/*
+/**
  * Heavily based on anonymous code contribution. No claim.
  *
  * civicrm_handler_field_relationship_type.inc
@@ -32,7 +32,7 @@
  */
 class civicrm_handler_field_relationship_type extends views_handler_field {
   static $_relationshipType;
-  function construct() {
+  public function construct() {
     parent::construct();
     if (!self::$_relationshipType) {
       if (!civicrm_initialize()) {
@@ -54,16 +54,13 @@ class civicrm_handler_field_relationship_type extends views_handler_field {
     }
   }
 
-  function render($values) {
+  public function render($values) {
     $lid = $values->{$this->field_alias};
-    if (empty($lid) ||
-      (int ) $lid <= 0
-    ) {
+    if (empty($lid) || (int) $lid <= 0) {
       return NULL;
     }
 
     return self::$_relationshipType[$values->{$this->field_alias}];
   }
-}
-
 
+}
diff --git a/modules/views/civicrm/civicrm_handler_field_state.inc b/modules/views/civicrm/civicrm_handler_field_state.inc
index 6075438..477f712 100644
--- a/modules/views/civicrm/civicrm_handler_field_state.inc
+++ b/modules/views/civicrm/civicrm_handler_field_state.inc
@@ -21,7 +21,7 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  * Field handler to provide acess control for the state field (which is a lookup)
@@ -31,7 +31,7 @@
 class civicrm_handler_field_state extends civicrm_handler_field_address {
   static $_states;
   static $_states_full;
-  function construct() {
+  public function construct() {
     parent::construct();
     if (!self::$_states || !self::$_states_full) {
       if (!civicrm_initialize()) {
@@ -43,31 +43,29 @@ class civicrm_handler_field_state extends civicrm_handler_field_address {
     }
   }
 
-  function render($values) {
+  public function render($values) {
     $sid = $values->{$this->field_alias};
-    if (empty($sid) ||
-      (int ) $sid <= 0
-    ) {
+    if (empty($sid) || (int) $sid <= 0) {
       return NULL;
     }
 
     if ($this->options['prov_display'] == 1) {
-      return  isset(self::$_states[$values->{$this->field_alias}])
-        ? self::$_states[$values->{$this->field_alias}]: NULL;
+      return isset(self::$_states[$values->{$this->field_alias}])
+        ? self::$_states[$values->{$this->field_alias}] : NULL;
     }
     else {
       return isset(self::$_states_full[$values->{$this->field_alias}])
-        ? self::$_states_full[$values->{$this->field_alias}]: NULL;
+        ? self::$_states_full[$values->{$this->field_alias}] : NULL;
     }
   }
 
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
     $options['prov_display'] = array('default' => '');
     return $options;
   }
 
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
     $form['prov_display'] = array(
       '#type' => 'radios',
@@ -77,5 +75,5 @@ class civicrm_handler_field_state extends civicrm_handler_field_address {
       '#default_value' => $this->options['prov_display'],
     );
   }
-}
 
+}

From 8f6c743e50d07cd3e67abef079203ff6acb3171b Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Sat, 16 Sep 2017 13:10:09 +1000
Subject: [PATCH 26/86] Run Civilint against the rest of views_handler and
 views plugin files

---
 .../civicrm_handler_filter_country_multi.inc  | 33 ++++++++++---------
 .../civicrm_handler_filter_custom_option.inc  | 23 ++++++-------
 ...rm_handler_filter_custom_single_option.inc | 19 ++++++-----
 .../civicrm_handler_filter_datetime.inc       | 24 ++++++--------
 .../civicrm/civicrm_handler_filter_domain.inc |  7 ++--
 ...ivicrm_handler_filter_encounter_medium.inc | 10 +++---
 .../civicrm_handler_filter_group_status.inc   | 12 +++----
 .../civicrm/civicrm_handler_filter_option.inc | 11 ++++---
 ...civicrm_handler_filter_pseudo_constant.inc | 12 +++----
 ...vicrm_handler_filter_relationship_type.inc | 12 +++----
 .../civicrm/civicrm_handler_relationship.inc  | 18 +++++-----
 .../civicrm_handler_relationship_address.inc  | 20 +++++------
 ...crm_handler_relationship_contact2users.inc |  7 ++--
 .../civicrm_handler_relationship_im.inc       | 16 ++++-----
 .../civicrm_handler_relationship_location.inc | 21 ++++++------
 .../civicrm_handler_relationship_mail.inc     |  6 ++--
 ...relationship_memberships_contributions.inc | 12 +++----
 .../civicrm_handler_relationship_phone.inc    | 22 ++++++-------
 ...icrm_handler_relationship_relationship.inc | 11 ++++---
 .../civicrm_handler_relationship_website.inc  | 16 ++++-----
 ...rm_handler_sort_address_pseudoconstant.inc |  9 +++--
 .../civicrm/civicrm_handler_sort_county.inc   |  5 +--
 .../civicrm/civicrm_handler_sort_date.inc     |  6 ++--
 ...civicrm_handler_sort_pcp_raised_amount.inc |  6 ++--
 .../civicrm/civicrm_handler_sort_state.inc    |  6 ++--
 .../civicrm_plugin_argument_default.inc       |  9 +++--
 .../views_handler_argument_civicrm_day.inc    | 14 ++++----
 ...iews_handler_argument_civicrm_fulldate.inc | 10 +++---
 .../views_handler_argument_civicrm_month.inc  | 14 ++++----
 .../views_handler_argument_civicrm_week.inc   |  8 ++---
 .../views_handler_argument_civicrm_year.inc   |  8 ++---
 ...ws_handler_argument_civicrm_year_month.inc | 12 +++----
 32 files changed, 210 insertions(+), 209 deletions(-)

diff --git a/modules/views/civicrm/civicrm_handler_filter_country_multi.inc b/modules/views/civicrm/civicrm_handler_filter_country_multi.inc
index ef894cb..e19a291 100644
--- a/modules/views/civicrm/civicrm_handler_filter_country_multi.inc
+++ b/modules/views/civicrm/civicrm_handler_filter_country_multi.inc
@@ -21,22 +21,23 @@
    | GNU Affero General Public License or the licensing of CiviCRM,     |
    | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
    +--------------------------------------------------------------------+
+ */
 
-   **
-   * @file Provides Views integration for CiviCRM Multi-Select Country custom fields
-   *
-   * @author DaveJ
-   * based on civicrm_handler_filter_custom_option and civicrm_handler_filter_country
-   */
+/**
+ * @file Provides Views integration for CiviCRM Multi-Select Country custom fields
+ *
+ * @author DaveJ
+ * based on civicrm_handler_filter_custom_option and civicrm_handler_filter_country
+ */
 class civicrm_handler_filter_country_multi extends views_handler_filter_in_operator {
-  function construct() {
+  public function construct() {
     parent::construct();
     if (!civicrm_initialize()) {
       return;
     }
   }
 
-  function get_value_options() {
+  public function get_value_options() {
     if (!isset($this->value_options)) {
       $countries = CRM_Core_PseudoConstant::country();
       $options = array();
@@ -49,7 +50,7 @@ class civicrm_handler_filter_country_multi extends views_handler_filter_in_opera
     }
   }
 
-  function operators() {
+  public function operators() {
     $operators = parent::operators();
     $operators += array(
       'all' => array(
@@ -57,13 +58,13 @@ class civicrm_handler_filter_country_multi extends views_handler_filter_in_opera
         'short' => t('all'),
         'method' => 'op_simple',
         'values' => 1,
-        ),
-      );
+      ),
+    );
 
     return $operators;
   }
 
-  function op_simple() {
+  public function op_simple() {
     if (empty($this->value)) {
       return;
     }
@@ -71,17 +72,19 @@ class civicrm_handler_filter_country_multi extends views_handler_filter_in_opera
     $this->ensure_my_table();
 
     // negated operator uses AND, positive uses OR
-    $op = $glue = null;
+    $op = $glue = NULL;
     switch ($this->operator) {
       case 'in':
         $op = ' = ';
         $glue = ' OR ';
         break;
+
       case 'not in':
         $op = ' != ';
         $glue = ' AND ';
         break;
-      case 'all' :
+
+      case 'all':
         $clause = "$this->table_alias.$this->real_field IN (" . implode(',', $this->value) . ")";
         break;
     }
@@ -95,5 +98,5 @@ class civicrm_handler_filter_country_multi extends views_handler_filter_in_opera
 
     $this->query->add_where_expression($this->options['group'], $clause);
   }
-}
 
+}
diff --git a/modules/views/civicrm/civicrm_handler_filter_custom_option.inc b/modules/views/civicrm/civicrm_handler_filter_custom_option.inc
index 1891229..61341dc 100644
--- a/modules/views/civicrm/civicrm_handler_filter_custom_option.inc
+++ b/modules/views/civicrm/civicrm_handler_filter_custom_option.inc
@@ -21,22 +21,23 @@
    | GNU Affero General Public License or the licensing of CiviCRM,     |
    | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
    +--------------------------------------------------------------------+
+ */
 
-   **
-   * @file Provides Views integration for multi valued fields like
-   * contact subtype and CiviCRM custom field option groups
-   *
-   * @author Matt Chapman <Matt@NinjitsuWeb.com>
-   */
+/**
+ * @file Provides Views integration for multi valued fields like
+ * contact subtype and CiviCRM custom field option groups
+ *
+ * @author Matt Chapman <Matt@NinjitsuWeb.com>
+ */
 class civicrm_handler_filter_custom_option extends views_handler_filter_in_operator {
-  function construct() {
+  public function construct() {
     parent::construct();
     if (!civicrm_initialize()) {
       return;
     }
   }
 
-  function get_value_options() {
+  public function get_value_options() {
     if (!isset($this->value_options)) {
       if ($this->real_field == 'contact_sub_type') {
         require_once 'CRM/Contact/BAO/ContactType.php';
@@ -57,7 +58,7 @@ class civicrm_handler_filter_custom_option extends views_handler_filter_in_opera
     }
   }
 
-  function operators() {
+  public function operators() {
     $operators = parent::operators();
     $operators += array(
       'all' => array(
@@ -71,7 +72,7 @@ class civicrm_handler_filter_custom_option extends views_handler_filter_in_opera
     return $operators;
   }
 
-  function op_simple() {
+  public function op_simple() {
     if (empty($this->value)) {
       return;
     }
@@ -89,5 +90,5 @@ class civicrm_handler_filter_custom_option extends views_handler_filter_in_opera
     $clause = implode($glue, $clauses);
     $this->query->add_where_expression($this->options['group'], $clause);
   }
-}
 
+}
diff --git a/modules/views/civicrm/civicrm_handler_filter_custom_single_option.inc b/modules/views/civicrm/civicrm_handler_filter_custom_single_option.inc
index 551e94d..b135dae 100644
--- a/modules/views/civicrm/civicrm_handler_filter_custom_single_option.inc
+++ b/modules/views/civicrm/civicrm_handler_filter_custom_single_option.inc
@@ -21,21 +21,22 @@
    | GNU Affero General Public License or the licensing of CiviCRM,     |
    | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
    +--------------------------------------------------------------------+
-   
-   **
-   * @file Provides Views integration for custom CiviCRM custom field option groups
-   *
-   * @author Matt Chapman <Matt@NinjitsuWeb.com>
-   */
+ */
+
+ /**
+  * @file Provides Views integration for custom CiviCRM custom field option groups
+  *
+  * @author Matt Chapman <Matt@NinjitsuWeb.com>
+  */
 class civicrm_handler_filter_custom_single_option extends views_handler_filter_in_operator {
-  function construct() {
+  public function construct() {
     parent::construct();
     if (!civicrm_initialize()) {
       return;
     }
   }
 
-  function get_value_options() {
+  public function get_value_options() {
     if (!isset($this->value_options)) {
       // extract the field id from the name
       if (preg_match('/_(\d+)$/', $this->real_field, $match)) {
@@ -49,5 +50,5 @@ class civicrm_handler_filter_custom_single_option extends views_handler_filter_i
       }
     }
   }
-}
 
+}
diff --git a/modules/views/civicrm/civicrm_handler_filter_datetime.inc b/modules/views/civicrm/civicrm_handler_filter_datetime.inc
index a4595a2..2dc8c03 100644
--- a/modules/views/civicrm/civicrm_handler_filter_datetime.inc
+++ b/modules/views/civicrm/civicrm_handler_filter_datetime.inc
@@ -21,8 +21,7 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
-
+ */
 
 /*
  * Unchanged anonymous code contribution. No claim.
@@ -32,17 +31,16 @@
  *
  */
 
-
-/*
+/**
  * All the comparisons need to be done with SQL DATETIMES and not unixtime
  */
 class civicrm_handler_filter_datetime extends views_handler_filter_date {
 
-  /*
-     * We use strtotime() to accept a wide range of date inputs and then
-     * convert the unixtime back to SQL DATETIME before adding the WHERE clause
-     */
-  function op_simple($field) {
+  /**
+   * We use strtotime() to accept a wide range of date inputs and then
+   * convert the unixtime back to SQL DATETIME before adding the WHERE clause
+   */
+  public function op_simple($field) {
     $value = intval(strtotime($this->value['value'], 0));
 
     if (!empty($this->value['type']) && $this->value['type'] == 'offset') {
@@ -55,7 +53,7 @@ class civicrm_handler_filter_datetime extends views_handler_filter_date {
     $this->query->add_where($this->options['group'], $field, $value, $this->operator);
   }
 
-  function op_between($field) {
+  public function op_between($field) {
     $a = intval(strtotime($this->value['min'], 0));
     $b = intval(strtotime($this->value['max'], 0));
 
@@ -70,16 +68,14 @@ class civicrm_handler_filter_datetime extends views_handler_filter_date {
     $a = $this->format_date($a);
     $b = $this->format_date($b);
 
-
     // This is safe because we are manually scrubbing the values.
     // It is necessary to do it this way because $a and $b are formulas when using an offset.
     $operator = strtoupper($this->operator);
     $this->query->add_where_expression($this->options['group'], "$field $operator '$a' AND '$b'");
   }
 
-  function format_date($unixtime) {
+  public function format_date($unixtime) {
     return date("Y-m-d H:i:s", $unixtime);
   }
-}
-
 
+}
diff --git a/modules/views/civicrm/civicrm_handler_filter_domain.inc b/modules/views/civicrm/civicrm_handler_filter_domain.inc
index a300a8e..26e59e8 100644
--- a/modules/views/civicrm/civicrm_handler_filter_domain.inc
+++ b/modules/views/civicrm/civicrm_handler_filter_domain.inc
@@ -21,7 +21,7 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  * Field hanlder to allow filtering by CiviCRM domain.
@@ -30,7 +30,7 @@ class civicrm_handler_filter_domain extends views_handler_filter_numeric {
   /**
    * Add an additonal operator which takes no arguments to the existing list provided by views_handler_filter_numeric.
    */
-  function operators() {
+  public function operators() {
     $operators = parent::operators();
     $operators['current_domain'] = array(
       'title' => t('Current CiviCRM domain'),
@@ -44,7 +44,7 @@ class civicrm_handler_filter_domain extends views_handler_filter_numeric {
   /**
    * Grab the current domain id using the civicrm api and filter the query.
    */
-  function current_domain($field) {
+  public function current_domain($field) {
     if (!civicrm_initialize()) {
       return FALSE;
     }
@@ -58,4 +58,5 @@ class civicrm_handler_filter_domain extends views_handler_filter_numeric {
       $this->query->add_where($this->options['group'], $field, $domain['id']);
     }
   }
+
 }
diff --git a/modules/views/civicrm/civicrm_handler_filter_encounter_medium.inc b/modules/views/civicrm/civicrm_handler_filter_encounter_medium.inc
index 884cadd..f2f67ca 100644
--- a/modules/views/civicrm/civicrm_handler_filter_encounter_medium.inc
+++ b/modules/views/civicrm/civicrm_handler_filter_encounter_medium.inc
@@ -21,10 +21,10 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 
-/*
+/**
  * Heavily based on anonymous code contribution. No claim.
  * CiviCRM Views Integration
  *
@@ -34,7 +34,7 @@
  */
 class civicrm_handler_filter_encounter_medium extends views_handler_filter_in_operator {
   static $_encounter_medium;
-  function construct() {
+  public function construct() {
     parent::construct();
     if (!self::$_encounter_medium) {
       if (!civicrm_initialize()) {
@@ -45,7 +45,7 @@ class civicrm_handler_filter_encounter_medium extends views_handler_filter_in_op
     }
   }
 
-  function get_value_options() {
+  public function get_value_options() {
     if (!isset($this->value_options)) {
       $this->value_title = t('Encounter Medium');
       $options = array();
@@ -55,5 +55,5 @@ class civicrm_handler_filter_encounter_medium extends views_handler_filter_in_op
       $this->value_options = $options;
     }
   }
-}
 
+}
diff --git a/modules/views/civicrm/civicrm_handler_filter_group_status.inc b/modules/views/civicrm/civicrm_handler_filter_group_status.inc
index 83e1ab6..8ff2f56 100644
--- a/modules/views/civicrm/civicrm_handler_filter_group_status.inc
+++ b/modules/views/civicrm/civicrm_handler_filter_group_status.inc
@@ -21,17 +21,17 @@
   | GNU Affero General Public License or the licensing of CiviCRM,     |
   | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
   +--------------------------------------------------------------------+
-*/
+ */
 
 
-/*
+/**
  * Heavily based on anonymous code contribution. No claim.
  * CiviCRM Views Integration
  */
 class civicrm_handler_filter_group_status extends views_handler_filter_in_operator {
 
   static $groupContactStatus = NULL;
-  function construct() {
+  public function construct() {
     parent::construct();
 
     if (!self::$groupContactStatus) {
@@ -46,7 +46,7 @@ class civicrm_handler_filter_group_status extends views_handler_filter_in_operat
     }
   }
 
-  function get_value_options() {
+  public function get_value_options() {
     if (!isset($this->value_options)) {
       $this->value_title = t('Contact Group Status');
       $options = array();
@@ -56,7 +56,5 @@ class civicrm_handler_filter_group_status extends views_handler_filter_in_operat
       $this->value_options = $options;
     }
   }
-}
-
-
 
+}
diff --git a/modules/views/civicrm/civicrm_handler_filter_option.inc b/modules/views/civicrm/civicrm_handler_filter_option.inc
index 7d52408..2ef3021 100644
--- a/modules/views/civicrm/civicrm_handler_filter_option.inc
+++ b/modules/views/civicrm/civicrm_handler_filter_option.inc
@@ -21,10 +21,14 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
+
+/**
+ * CiviCRM handler for options with the in operator.
+ */
 class civicrm_handler_filter_option extends views_handler_filter_in_operator {
   static $_options;
-  function get_value_options() {
+  public function get_value_options() {
     $this->initialize();
 
     if (!isset($this->value_options)) {
@@ -36,6 +40,5 @@ class civicrm_handler_filter_option extends views_handler_filter_in_operator {
       $this->value_options = $options;
     }
   }
-}
-
 
+}
diff --git a/modules/views/civicrm/civicrm_handler_filter_pseudo_constant.inc b/modules/views/civicrm/civicrm_handler_filter_pseudo_constant.inc
index 3ab025c..f3bd3ba 100644
--- a/modules/views/civicrm/civicrm_handler_filter_pseudo_constant.inc
+++ b/modules/views/civicrm/civicrm_handler_filter_pseudo_constant.inc
@@ -21,10 +21,9 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
-
+ */
 
-/*
+/**
  * Developed by Jim Taylor.
  * CiviCRM Views Integration
  *
@@ -33,7 +32,8 @@
  *
  */
 class civicrm_handler_filter_pseudo_constant extends views_handler_filter_in_operator {
-  public $_pseudo_constant; function construct() {
+  public $_pseudo_constant;
+  public function construct() {
     parent::construct();
     if (!civicrm_initialize() ||
       !isset($this->definition['pseudo class']) ||
@@ -58,7 +58,7 @@ class civicrm_handler_filter_pseudo_constant extends views_handler_filter_in_ope
     $this->_pseudo_constant = call_user_func_array($this->definition['pseudo class'] . "::" . $this->definition['pseudo method'], $pseudo_args);
   }
 
-  function get_value_options() {
+  public function get_value_options() {
     if (!isset($this->value_options)) {
       $this->value_title = $this->definition['title'];
       $options = array();
@@ -68,5 +68,5 @@ class civicrm_handler_filter_pseudo_constant extends views_handler_filter_in_ope
       $this->value_options = $options;
     }
   }
-}
 
+}
diff --git a/modules/views/civicrm/civicrm_handler_filter_relationship_type.inc b/modules/views/civicrm/civicrm_handler_filter_relationship_type.inc
index adffc27..1747040 100644
--- a/modules/views/civicrm/civicrm_handler_filter_relationship_type.inc
+++ b/modules/views/civicrm/civicrm_handler_filter_relationship_type.inc
@@ -21,10 +21,9 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
-
+ */
 
-/*
+/**
  * Heavily based on anonymous code contribution. No claim.
  * CiviCRM Views Integration
  *
@@ -34,7 +33,7 @@
  */
 class civicrm_handler_filter_relationship_type extends views_handler_filter_in_operator {
   static $_relationshipType;
-  function construct() {
+  public function construct() {
     parent::construct();
     if (!self::$_relationshipType) {
       if (!civicrm_initialize()) {
@@ -56,7 +55,7 @@ class civicrm_handler_filter_relationship_type extends views_handler_filter_in_o
     }
   }
 
-  function get_value_options() {
+  public function get_value_options() {
     if (!isset($this->value_options)) {
       $this->value_title = t('Relationship Type');
       $options = array();
@@ -66,6 +65,5 @@ class civicrm_handler_filter_relationship_type extends views_handler_filter_in_o
       $this->value_options = $options;
     }
   }
-}
-
 
+}
diff --git a/modules/views/civicrm/civicrm_handler_relationship.inc b/modules/views/civicrm/civicrm_handler_relationship.inc
index 72f9b13..7b4f5ea 100644
--- a/modules/views/civicrm/civicrm_handler_relationship.inc
+++ b/modules/views/civicrm/civicrm_handler_relationship.inc
@@ -40,11 +40,11 @@ class civicrm_handler_relationship extends views_handler_relationship {
    * Init handler to let relationships live on tables other than
    * the table they operate on.
    */
-  function init(&$view, &$options) {
+  public function init(&$view, &$options) {
     parent::init($view, $options);
   }
 
-  function construct() {
+  public function construct() {
     parent::construct();
     if (!civicrm_initialize()) {
       return;
@@ -70,14 +70,14 @@ class civicrm_handler_relationship extends views_handler_relationship {
   /**
    * Get this field's label.
    */
-  function label() {
+  public function label() {
     if (!isset($this->options['label'])) {
       return '';
     }
     return $this->options['label'];
   }
 
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
     $label = !empty($this->definition['label']) ? $this->definition['label'] : $this->definition['title'];
     $options['label'] = array('default' => $label, 'translatable' => TRUE);
@@ -90,7 +90,7 @@ class civicrm_handler_relationship extends views_handler_relationship {
    * Default options form that provides the label widget that all fields
    * should have.
    */
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
     $form['label'] = array(
       '#type' => 'textfield',
@@ -111,14 +111,14 @@ class civicrm_handler_relationship extends views_handler_relationship {
       '#type' => 'checkbox',
       '#title' => t('Limit results only to active relationships?'),
       '#default_value' => $this->options['relationship_state'],
-      '#description' => t('Exclude relationships that are inactive.')
+      '#description' => t('Exclude relationships that are inactive.'),
     );
   }
 
   /**
    * Called to implement a relationship in a query.
    */
-  function query() {
+  public function query() {
 
     // Figure out what base table this relationship brings to the party.
     $table_data        = views_fetch_data($this->definition['base']);
@@ -144,7 +144,7 @@ class civicrm_handler_relationship extends views_handler_relationship {
     }
 
     if (!empty($def['join_handler']) && class_exists($def['join_handler'])) {
-      $join = new $def['join_handler'];
+      $join = new $def['join_handler']();
     }
     else {
       $join = new views_join();
@@ -178,5 +178,5 @@ class civicrm_handler_relationship extends views_handler_relationship {
 
     $this->alias = $this->query->add_relationship($alias, $join, $this->definition['base'], $this->relationship);
   }
-}
 
+}
diff --git a/modules/views/civicrm/civicrm_handler_relationship_address.inc b/modules/views/civicrm/civicrm_handler_relationship_address.inc
index b2e280b..c856607 100644
--- a/modules/views/civicrm/civicrm_handler_relationship_address.inc
+++ b/modules/views/civicrm/civicrm_handler_relationship_address.inc
@@ -21,22 +21,22 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  * Field handler to provide relationship to CiviCRM email.
-*
-* @ingroup civicrm_relationship_handlers
-*/
+ *
+ * @ingroup civicrm_relationship_handlers
+ */
 class civicrm_handler_relationship_address extends civicrm_handler_relationship_location {
 
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
     $options['is_billing'] = array('default' => 0);
     return $options;
   }
 
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
     $form['is_billing'] = array(
       '#type' => 'checkbox',
@@ -48,7 +48,7 @@ class civicrm_handler_relationship_address extends civicrm_handler_relationship_
     );
   }
 
-  function join_address($join = array()) {
+  public function join_address($join = array()) {
     $extra = array();
     if (isset($join->extra)) {
       $extra = $join->extra;
@@ -67,7 +67,7 @@ class civicrm_handler_relationship_address extends civicrm_handler_relationship_
     return $join;
   }
 
-  function get_join() {
+  public function get_join() {
     $join = parent::get_join();
     $join = $this->join_address($join);
     return $join;
@@ -77,7 +77,7 @@ class civicrm_handler_relationship_address extends civicrm_handler_relationship_
   /**
    * Called to implement a relationship in a query.
    */
-  function query() {
+  public function query() {
     $join = $this->get_join();
     $this->alias = $this->query->add_table($this->table, $this->relationship, $join);
     //register relationship
@@ -88,5 +88,5 @@ class civicrm_handler_relationship_address extends civicrm_handler_relationship_
       'base' => $this->table,
     );
   }
-}
 
+}
diff --git a/modules/views/civicrm/civicrm_handler_relationship_contact2users.inc b/modules/views/civicrm/civicrm_handler_relationship_contact2users.inc
index 62c4452..736083b 100644
--- a/modules/views/civicrm/civicrm_handler_relationship_contact2users.inc
+++ b/modules/views/civicrm/civicrm_handler_relationship_contact2users.inc
@@ -21,7 +21,7 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  * Field handler to provide relationship to Drupal User ID
@@ -33,7 +33,7 @@ class civicrm_handler_relationship_contact2users extends views_handler_relations
   /**
    * Called to implement a relationship in a query.
    */
-  function query() {
+  public function query() {
 
     $join = new views_join();
     $join->definition = array(
@@ -52,7 +52,6 @@ class civicrm_handler_relationship_contact2users extends views_handler_relations
 
     $this->first_join = $this->query->add_table('civicrm_uf_match', $this->relationship, $join);
 
-
     // Then, create a relationship on that table:
     $join = new views_join();
     $join->definition = array(
@@ -72,5 +71,5 @@ class civicrm_handler_relationship_contact2users extends views_handler_relations
 
     $this->alias = $this->query->add_relationship($alias, $join, 'users');
   }
-}
 
+}
diff --git a/modules/views/civicrm/civicrm_handler_relationship_im.inc b/modules/views/civicrm/civicrm_handler_relationship_im.inc
index f53f082..b22462e 100644
--- a/modules/views/civicrm/civicrm_handler_relationship_im.inc
+++ b/modules/views/civicrm/civicrm_handler_relationship_im.inc
@@ -21,7 +21,7 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  * Field handler to provide relationship to CiviCRM Instant Messaging.
@@ -31,7 +31,7 @@
 class civicrm_handler_relationship_im extends civicrm_handler_relationship_location {
 
   static $_provider;
-  function construct() {
+  public function construct() {
     parent::construct();
     if (!self::$_provider) {
       if (!civicrm_initialize()) {
@@ -41,13 +41,13 @@ class civicrm_handler_relationship_im extends civicrm_handler_relationship_locat
     }
   }
 
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
     $options['provider'] = array('default' => 0);
     return $options;
   }
 
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
     $imOptions = array(0 => 'Any');
     foreach (self::$_provider as $id => $type) {
@@ -63,7 +63,7 @@ class civicrm_handler_relationship_im extends civicrm_handler_relationship_locat
     );
   }
 
-  function join_im($join = array()) {
+  public function join_im($join = array()) {
     $extra = array();
     if (isset($join->extra)) {
       $extra = $join->extra;
@@ -82,7 +82,7 @@ class civicrm_handler_relationship_im extends civicrm_handler_relationship_locat
     return $join;
   }
 
-  function get_join() {
+  public function get_join() {
     $join = parent::get_join();
     $join = $this->join_im($join);
     return $join;
@@ -91,7 +91,7 @@ class civicrm_handler_relationship_im extends civicrm_handler_relationship_locat
   /**
    * Called to implement a relationship in a query.
    */
-  function query() {
+  public function query() {
     $join = $this->get_join();
     $this->alias = $this->query->add_table($this->table, $this->relationship, $join);
     //register relationship
@@ -102,5 +102,5 @@ class civicrm_handler_relationship_im extends civicrm_handler_relationship_locat
       'base' => $this->table,
     );
   }
-}
 
+}
diff --git a/modules/views/civicrm/civicrm_handler_relationship_location.inc b/modules/views/civicrm/civicrm_handler_relationship_location.inc
index ae452bc..acd2024 100644
--- a/modules/views/civicrm/civicrm_handler_relationship_location.inc
+++ b/modules/views/civicrm/civicrm_handler_relationship_location.inc
@@ -21,7 +21,7 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  * Field handler to provide relationship to CiviCRM email.
@@ -34,7 +34,7 @@ class civicrm_handler_relationship_location extends views_handler_relationship {
   static $_locationOps;
   static $location_op;
 
-  function construct() {
+  public function construct() {
     parent::construct();
     if (!self::$_locationTypes) {
       if (!civicrm_initialize()) {
@@ -46,7 +46,7 @@ class civicrm_handler_relationship_location extends views_handler_relationship {
     }
   }
 
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
     $options['location_type'] = array('default' => 0);
     $options['location_op'] = array('default' => 0);
@@ -54,7 +54,7 @@ class civicrm_handler_relationship_location extends views_handler_relationship {
     return $options;
   }
 
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
 
     $locationOptions = array(0 => 'Any');
@@ -67,7 +67,7 @@ class civicrm_handler_relationship_location extends views_handler_relationship {
       '#title' => t('Label'),
       '#default_value' => $label,
       '#dependency' => array(
-          'edit-options-custom-label' => array(1),
+        'edit-options-custom-label' => array(1),
       ),
       '#weight' => -102,
     );
@@ -105,7 +105,7 @@ class civicrm_handler_relationship_location extends views_handler_relationship {
     );
   }
 
-  function location_extras() {
+  public function location_extras() {
     $extra = array();
     if (!empty($this->options['location_type'])) {
       $extra[] = array(
@@ -127,14 +127,14 @@ class civicrm_handler_relationship_location extends views_handler_relationship {
   }
 
 
-  function join_required($join = array()) {
+  public function join_required($join = array()) {
     if (!empty($this->options['required'])) {
       $join->type = 'INNER';
     }
     return $join;
   }
 
-  function join_location($join = array()) {
+  public function join_location($join = array()) {
     $extra = array();
     if (isset($join->extra)) {
       $extra = $join->extra;
@@ -147,7 +147,7 @@ class civicrm_handler_relationship_location extends views_handler_relationship {
     return $join;
   }
 
-  function get_join() {
+  public function get_join() {
     $join = parent::get_join();
     $join = $this->join_required($join);
     $join = $this->join_location($join);
@@ -157,11 +157,12 @@ class civicrm_handler_relationship_location extends views_handler_relationship {
   /**
    * Called to implement a relationship in a query.
    */
-  function query() {
+  public function query() {
     $join = $this->get_join();
     $this->alias = $this->query->add_table($this->table, $this->relationship, $join);
     //register relationship
     $this->view->relationship[$this->options['id']]->alias = $this->alias;
     $this->alias = $this->table_alias;
   }
+
 }
diff --git a/modules/views/civicrm/civicrm_handler_relationship_mail.inc b/modules/views/civicrm/civicrm_handler_relationship_mail.inc
index 2ad12df..4ba40a7 100644
--- a/modules/views/civicrm/civicrm_handler_relationship_mail.inc
+++ b/modules/views/civicrm/civicrm_handler_relationship_mail.inc
@@ -21,7 +21,7 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  * Field handler to provide relationship to CiviCRM email.
@@ -33,7 +33,7 @@ class civicrm_handler_relationship_mail extends civicrm_handler_relationship_loc
   /**
    * Called to implement a relationship in a query.
    */
-  function query() {
+  public function query() {
     $join = $this->get_join();
     $this->alias = $this->query->add_table($this->table, $this->relationship, $join);
     //register relationship
@@ -44,5 +44,5 @@ class civicrm_handler_relationship_mail extends civicrm_handler_relationship_loc
       'base' => $this->table,
     );
   }
-}
 
+}
diff --git a/modules/views/civicrm/civicrm_handler_relationship_memberships_contributions.inc b/modules/views/civicrm/civicrm_handler_relationship_memberships_contributions.inc
index 259d29c..d9e1e8b 100644
--- a/modules/views/civicrm/civicrm_handler_relationship_memberships_contributions.inc
+++ b/modules/views/civicrm/civicrm_handler_relationship_memberships_contributions.inc
@@ -21,7 +21,7 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  * Field handler to provide relationship between memberships and contributions
@@ -33,16 +33,17 @@ class civicrm_handler_relationship_memberships_contributions extends views_handl
   /**
    * Called to implement a relationship in a query.
    */
-  function query() {
+  public function query() {
     $join = new views_join();
-    if($this->options['table'] == "civicrm_membership"){
+    if ($this->options['table'] == "civicrm_membership") {
       $join->definition = array(
         'left_table' => 'civicrm_membership',
         'left_field' => 'id',
         'table' => 'civicrm_membership_payment',
         'field' => 'membership_id',
       );
-    }else{
+    }
+    else {
       $join->definition = array(
         'left_table' => 'civicrm_contribution',
         'left_field' => 'id',
@@ -61,7 +62,6 @@ class civicrm_handler_relationship_memberships_contributions extends views_handl
 
     $this->first_join = $this->query->add_table('civicrm_membership_payment', $this->relationship, $join);
 
-
     // Then, create a relationship on that table:
     $join = new views_join();
     $join->definition = array(
@@ -81,5 +81,5 @@ class civicrm_handler_relationship_memberships_contributions extends views_handl
 
     $this->alias = $this->query->add_relationship($alias, $join, $this->definition['base'], $this->relationship);
   }
-}
 
+}
diff --git a/modules/views/civicrm/civicrm_handler_relationship_phone.inc b/modules/views/civicrm/civicrm_handler_relationship_phone.inc
index f841e28..43c7284 100644
--- a/modules/views/civicrm/civicrm_handler_relationship_phone.inc
+++ b/modules/views/civicrm/civicrm_handler_relationship_phone.inc
@@ -21,17 +21,17 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  * Field handler to provide relationship to CiviCRM email.
-*
-* @ingroup civicrm_relationship_handlers
-*/
+ *
+ * @ingroup civicrm_relationship_handlers
+ */
 class civicrm_handler_relationship_phone extends civicrm_handler_relationship_location {
 
   static $_phoneType;
-  function construct() {
+  public function construct() {
     parent::construct();
     if (!self::$_phoneType) {
       if (!civicrm_initialize()) {
@@ -41,13 +41,13 @@ class civicrm_handler_relationship_phone extends civicrm_handler_relationship_lo
     }
   }
 
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
     $options['phone_type'] = array('default' => 0);
     return $options;
   }
 
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
     $phoneOptions = array(0 => 'Any');
     foreach (self::$_phoneType as $id => $type) {
@@ -63,8 +63,7 @@ class civicrm_handler_relationship_phone extends civicrm_handler_relationship_lo
     );
   }
 
-
-  function join_phone($join = array()) {
+  public function join_phone($join = array()) {
     $extra = array();
     if (isset($join->extra)) {
       $extra = $join->extra;
@@ -83,7 +82,7 @@ class civicrm_handler_relationship_phone extends civicrm_handler_relationship_lo
     return $join;
   }
 
-  function get_join() {
+  public function get_join() {
     $join = parent::get_join();
     $join = $this->join_phone($join);
     return $join;
@@ -92,7 +91,7 @@ class civicrm_handler_relationship_phone extends civicrm_handler_relationship_lo
   /**
    * Called to implement a relationship in a query.
    */
-  function query() {
+  public function query() {
     $join = $this->get_join();
     $this->alias = $this->query->add_table($this->table, $this->relationship, $join);
     //register relationship
@@ -103,4 +102,5 @@ class civicrm_handler_relationship_phone extends civicrm_handler_relationship_lo
       'base' => $this->table,
     );
   }
+
 }
diff --git a/modules/views/civicrm/civicrm_handler_relationship_relationship.inc b/modules/views/civicrm/civicrm_handler_relationship_relationship.inc
index d172f69..4f52371 100644
--- a/modules/views/civicrm/civicrm_handler_relationship_relationship.inc
+++ b/modules/views/civicrm/civicrm_handler_relationship_relationship.inc
@@ -12,7 +12,7 @@ class civicrm_handler_relationship_relationship extends views_handler_relationsh
    * Preload the list of relationship_types and store in the static variable
    * $relationship_types
    */
-  function construct() {
+  public function construct() {
     parent::construct();
 
     if (!civicrm_initialize()) {
@@ -34,7 +34,7 @@ class civicrm_handler_relationship_relationship extends views_handler_relationsh
    * to the view. By defining these here, Views will take care of saving the
    * values submitted from the options form.
    */
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
     $options['relationship_type'] = array('default' => 0);
     $options['relationship_state'] = array('default' => 1);
@@ -45,7 +45,7 @@ class civicrm_handler_relationship_relationship extends views_handler_relationsh
    * Add relationship_type drowndown and relationship_state checkbox to
    * relationship configuration form.
    */
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
 
     $form['relationship_type'] = array(
@@ -60,7 +60,7 @@ class civicrm_handler_relationship_relationship extends views_handler_relationsh
       '#type' => 'checkbox',
       '#title' => t('Limit results only to active relationships?'),
       '#default_value' => $this->options['relationship_state'],
-      '#description' => t('Exclude relationships that are inactive.')
+      '#description' => t('Exclude relationships that are inactive.'),
     );
   }
 
@@ -68,7 +68,7 @@ class civicrm_handler_relationship_relationship extends views_handler_relationsh
    * Modify the default views relationship query to optionally specify
    * join conditions for relationship_type or is_active (relationship_state).
    */
-  function query() {
+  public function query() {
     parent::query();
 
     // Specify the type of relationships to join
@@ -89,4 +89,5 @@ class civicrm_handler_relationship_relationship extends views_handler_relationsh
       );
     }
   }
+
 }
diff --git a/modules/views/civicrm/civicrm_handler_relationship_website.inc b/modules/views/civicrm/civicrm_handler_relationship_website.inc
index cb808d3..e5388c8 100644
--- a/modules/views/civicrm/civicrm_handler_relationship_website.inc
+++ b/modules/views/civicrm/civicrm_handler_relationship_website.inc
@@ -21,7 +21,7 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  * Field handler to provide relationship to CiviCRM Website.
@@ -31,7 +31,7 @@
 class civicrm_handler_relationship_website extends civicrm_handler_relationship_location {
 
   static $_websiteType;
-  function construct() {
+  public function construct() {
     parent::construct();
     if (!self::$_websiteType) {
       if (!civicrm_initialize()) {
@@ -41,13 +41,13 @@ class civicrm_handler_relationship_website extends civicrm_handler_relationship_
     }
   }
 
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
     $options['website_type'] = array('default' => 0);
     return $options;
   }
 
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
     $websiteOptions = array(0 => 'Any');
     foreach (self::$_websiteType as $id => $type) {
@@ -63,7 +63,7 @@ class civicrm_handler_relationship_website extends civicrm_handler_relationship_
     );
   }
 
-  function join_website($join = array()) {
+  public function join_website($join = array()) {
     $extra = array();
     if (isset($join->extra)) {
       $extra = $join->extra;
@@ -82,7 +82,7 @@ class civicrm_handler_relationship_website extends civicrm_handler_relationship_
     return $join;
   }
 
-  function get_join() {
+  public function get_join() {
     $join = parent::get_join();
     $join = $this->join_website($join);
     return $join;
@@ -91,7 +91,7 @@ class civicrm_handler_relationship_website extends civicrm_handler_relationship_
   /**
    * Called to implement a relationship in a query.
    */
-  function query() {
+  public function query() {
     $join = $this->get_join();
     $this->alias = $this->query->add_table($this->table, $this->relationship, $join);
     //register relationship
@@ -102,5 +102,5 @@ class civicrm_handler_relationship_website extends civicrm_handler_relationship_
       'base' => $this->table,
     );
   }
-}
 
+}
diff --git a/modules/views/civicrm/civicrm_handler_sort_address_pseudoconstant.inc b/modules/views/civicrm/civicrm_handler_sort_address_pseudoconstant.inc
index 9dc73c9..6ea609f 100644
--- a/modules/views/civicrm/civicrm_handler_sort_address_pseudoconstant.inc
+++ b/modules/views/civicrm/civicrm_handler_sort_address_pseudoconstant.inc
@@ -21,7 +21,7 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  * sort handler to properly pass the field type for date fields.
@@ -35,11 +35,11 @@ class civicrm_handler_sort_address_pseudoconstant extends views_handler_sort {
    */
   private   $_join_alias;
 
-  function ensure_my_table() {
+  public function ensure_my_table() {
     $join_table = $this->definition['join_table'];
     $join_field = $this->definition['join_field'];
     $join_left_field = $this->definition['join_left_field'];
-    
+
     $alias = parent::ensure_my_table();
 
     // Use the relationship if one is specified; otherwise, use the base table_alias.
@@ -67,10 +67,9 @@ class civicrm_handler_sort_address_pseudoconstant extends views_handler_sort {
     return $table_alias;
   }
 
-  function query() {
+  public function query() {
     $this->ensure_my_table();
     $this->query->add_orderby($this->_join_alias, 'name', $this->options['order']);
   }
 
 }
-
diff --git a/modules/views/civicrm/civicrm_handler_sort_county.inc b/modules/views/civicrm/civicrm_handler_sort_county.inc
index d1d9e58..1fbca4e 100644
--- a/modules/views/civicrm/civicrm_handler_sort_county.inc
+++ b/modules/views/civicrm/civicrm_handler_sort_county.inc
@@ -21,7 +21,7 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  * sort handler to properly pass the field type for date fields.
@@ -29,11 +29,12 @@
  */
 class civicrm_handler_sort_county extends civicrm_handler_sort_address_pseudoconstant {
 
-  function ensure_my_table() {
+  public function ensure_my_table() {
     $this->_join_table = 'civicrm_county';
     $this->_join_left_field = 'county_id';
     $this->_join_field = 'id';
 
     return parent::ensure_my_table();
   }
+
 }
diff --git a/modules/views/civicrm/civicrm_handler_sort_date.inc b/modules/views/civicrm/civicrm_handler_sort_date.inc
index c51adbc..397cc6d 100644
--- a/modules/views/civicrm/civicrm_handler_sort_date.inc
+++ b/modules/views/civicrm/civicrm_handler_sort_date.inc
@@ -21,7 +21,7 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  * sort handler to properly pass the field type for date fields.
@@ -33,7 +33,7 @@ class civicrm_handler_sort_date extends views_handler_sort_date {
    * Called to add the sort to a query.
    * Overridden to pass the field type
    */
-  function query() {
+  public function query() {
     $this->ensure_my_table();
     switch ($this->options['granularity']) {
       case 'second':
@@ -64,5 +64,5 @@ class civicrm_handler_sort_date extends views_handler_sort_date {
     // Add the field.
     $this->query->add_orderby(NULL, $formula, $this->options['order'], $this->table_alias . '_' . $this->field . '_' . $this->options['granularity']);
   }
-}
 
+}
diff --git a/modules/views/civicrm/civicrm_handler_sort_pcp_raised_amount.inc b/modules/views/civicrm/civicrm_handler_sort_pcp_raised_amount.inc
index 077ccef..45f2938 100644
--- a/modules/views/civicrm/civicrm_handler_sort_pcp_raised_amount.inc
+++ b/modules/views/civicrm/civicrm_handler_sort_pcp_raised_amount.inc
@@ -21,14 +21,14 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  * sorting handler to calcuate the total amount raised for PCPs.
  *
  */
 class civicrm_handler_sort_pcp_raised_amount extends views_handler_sort {
-  function query() {
+  public function query() {
     $this->ensure_my_table();
 
     // @see CRM_PCP_BAO_PCP::thermoMeter for the source of this SQL
@@ -41,5 +41,5 @@ WHERE pcp2.id = " . $this->table_alias . "." . $this->real_field . " AND cc.cont
 
     $this->query->add_orderby(NULL, $formula, $this->options['order'], $this->table_alias . '_' . $this->field);
   }
-}
 
+}
diff --git a/modules/views/civicrm/civicrm_handler_sort_state.inc b/modules/views/civicrm/civicrm_handler_sort_state.inc
index 6c74a4c..1ad3302 100644
--- a/modules/views/civicrm/civicrm_handler_sort_state.inc
+++ b/modules/views/civicrm/civicrm_handler_sort_state.inc
@@ -21,7 +21,7 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  * sort handler to properly pass the field type for date fields.
@@ -29,12 +29,12 @@
  */
 class civicrm_handler_sort_state extends civicrm_handler_sort_address_pseudoconstant {
 
-  function ensure_my_table() {
+  public function ensure_my_table() {
     $this->_join_table = 'civicrm_state_province';
     $this->_join_left_field = 'state_province_id';
     $this->_join_field = 'id';
 
     return parent::ensure_my_table();
   }
-}
 
+}
diff --git a/modules/views/civicrm/civicrm_plugin_argument_default.inc b/modules/views/civicrm/civicrm_plugin_argument_default.inc
index 38bf314..8628e6b 100644
--- a/modules/views/civicrm/civicrm_plugin_argument_default.inc
+++ b/modules/views/civicrm/civicrm_plugin_argument_default.inc
@@ -21,14 +21,14 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  * Default argument plugin to extract a civicrm user id via menu_get_object
  */
 class civicrm_plugin_argument_default extends views_plugin_argument_default {
   var $option_name = 'default_argument_civicrm';
-  function argument_form(&$form, &$form_state) {
+  public function argument_form(&$form, &$form_state) {
     $form[$this->option_name] = array(
       '#type' => 'checkbox',
       '#title' => t('Also look for a node and use the node author'),
@@ -42,7 +42,7 @@ class civicrm_plugin_argument_default extends views_plugin_argument_default {
     );
   }
 
-  function get_argument() {
+  public function get_argument() {
     foreach (range(1, 3) as $i) {
       $user = menu_get_object('user', $i);
       if (!empty($user)) {
@@ -66,6 +66,5 @@ class civicrm_plugin_argument_default extends views_plugin_argument_default {
       }
     }
   }
-}
-
 
+}
diff --git a/modules/views/civicrm/views_handler_argument_civicrm_day.inc b/modules/views/civicrm/views_handler_argument_civicrm_day.inc
index eccc5af..0b4eafd 100644
--- a/modules/views/civicrm/views_handler_argument_civicrm_day.inc
+++ b/modules/views/civicrm/views_handler_argument_civicrm_day.inc
@@ -21,7 +21,7 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  * Argument handler for a day (DD)
@@ -31,17 +31,17 @@ class views_handler_argument_civicrm_day extends views_handler_argument_date {
   /**
    * Constructor implementation
    */
-  function construct() {
+  public function construct() {
     parent::construct();
     $this->format     = 'j';
     $this->arg_format = 'd';
-    $this->formula    = views_date_sql_extract('DAY', "***table***.$this->real_field","datetime",0);
+    $this->formula    = views_date_sql_extract('DAY', "***table***.$this->real_field", "datetime", 0);
   }
 
   /**
    * Provide a link to the next level of the view
    */
-  function summary_name($data) {
+  public function summary_name($data) {
     $day = str_pad($data->{$this->name_alias}, 2, '0', STR_PAD_LEFT);
     return format_date(strtotime("2005" . "05" . $day . " 00:00:00 UTC"), 'custom', $this->format, 'UTC');
   }
@@ -49,14 +49,14 @@ class views_handler_argument_civicrm_day extends views_handler_argument_date {
   /**
    * Provide a link to the next level of the view
    */
-  function title() {
+  public function title() {
     $day = str_pad($this->argument, 2, '0', STR_PAD_LEFT);
     return format_date(strtotime("2005" . "05" . $day . " 00:00:00 UTC"), 'custom', $this->format, 'UTC');
   }
 
-  function summary_argument($data) {
+  public function summary_argument($data) {
     // Make sure the argument contains leading zeroes.
     return str_pad($data->{$this->base_alias}, 2, '0', STR_PAD_LEFT);
   }
-}
 
+}
diff --git a/modules/views/civicrm/views_handler_argument_civicrm_fulldate.inc b/modules/views/civicrm/views_handler_argument_civicrm_fulldate.inc
index 966f5e9..6232c3a 100644
--- a/modules/views/civicrm/views_handler_argument_civicrm_fulldate.inc
+++ b/modules/views/civicrm/views_handler_argument_civicrm_fulldate.inc
@@ -21,7 +21,7 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  * Argument handler for a full date (CCYYMMDD)
@@ -31,7 +31,7 @@ class views_handler_argument_civicrm_fulldate extends views_handler_argument_dat
   /**
    * Constructor implementation
    */
-  function construct() {
+  public function construct() {
     parent::construct();
     $this->format     = 'F j, Y';
     $this->arg_format = 'Ymd';
@@ -43,7 +43,7 @@ class views_handler_argument_civicrm_fulldate extends views_handler_argument_dat
   /**
    * Provide a link to the next level of the view
    */
-  function summary_name($data) {
+  public function summary_name($data) {
     $created = $data->{$this->name_alias};
     return format_date(strtotime($created . " 00:00:00 UTC"), 'custom', $this->format, 'UTC');
   }
@@ -51,8 +51,8 @@ class views_handler_argument_civicrm_fulldate extends views_handler_argument_dat
   /**
    * Provide a link to the next level of the view
    */
-  function title() {
+  public function title() {
     return format_date(strtotime($this->argument . " 00:00:00 UTC"), 'custom', $this->format, 'UTC');
   }
-}
 
+}
diff --git a/modules/views/civicrm/views_handler_argument_civicrm_month.inc b/modules/views/civicrm/views_handler_argument_civicrm_month.inc
index ed33459..923b1c6 100644
--- a/modules/views/civicrm/views_handler_argument_civicrm_month.inc
+++ b/modules/views/civicrm/views_handler_argument_civicrm_month.inc
@@ -21,7 +21,7 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  * Argument handler for a month (MM)
@@ -31,9 +31,9 @@ class views_handler_argument_civicrm_month extends views_handler_argument_date {
   /**
    * Constructor implementation
    */
-  function construct() {
+  public function construct() {
     parent::construct();
-    $this->formula    = views_date_sql_extract('MONTH', "***table***.$this->real_field","datetime",0);
+    $this->formula    = views_date_sql_extract('MONTH', "***table***.$this->real_field", "datetime", 0);
     $this->format     = 'F';
     $this->arg_format = 'm';
   }
@@ -41,7 +41,7 @@ class views_handler_argument_civicrm_month extends views_handler_argument_date {
   /**
    * Provide a link to the next level of the view
    */
-  function summary_name($data) {
+  public function summary_name($data) {
     $month = str_pad($data->{$this->name_alias}, 2, '0', STR_PAD_LEFT);
     return format_date(strtotime("2005" . $month . "15" . " 00:00:00 UTC"), 'custom', $this->format, 'UTC');
   }
@@ -49,14 +49,14 @@ class views_handler_argument_civicrm_month extends views_handler_argument_date {
   /**
    * Provide a link to the next level of the view
    */
-  function title() {
+  public function title() {
     $month = str_pad($this->argument, 2, '0', STR_PAD_LEFT);
     return format_date(strtotime("2005" . $month . "15" . " 00:00:00 UTC"), 'custom', $this->format, 'UTC');
   }
 
-  function summary_argument($data) {
+  public function summary_argument($data) {
     // Make sure the argument contains leading zeroes.
     return str_pad($data->{$this->base_alias}, 2, '0', STR_PAD_LEFT);
   }
-}
 
+}
diff --git a/modules/views/civicrm/views_handler_argument_civicrm_week.inc b/modules/views/civicrm/views_handler_argument_civicrm_week.inc
index bcfa3de..16d6977 100644
--- a/modules/views/civicrm/views_handler_argument_civicrm_week.inc
+++ b/modules/views/civicrm/views_handler_argument_civicrm_week.inc
@@ -21,7 +21,7 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  * Argument handler for a week.
@@ -31,7 +31,7 @@ class views_handler_argument_civicrm_week extends views_handler_argument_date {
   /**
    * Constructor implementation
    */
-  function construct() {
+  public function construct() {
     parent::construct();
     $this->arg_format = 'w';
     $this->formula = views_date_sql_extract('WEEK', "***table***.$this->real_field", "datetime", '0');
@@ -40,9 +40,9 @@ class views_handler_argument_civicrm_week extends views_handler_argument_date {
   /**
    * Provide a link to the next level of the view
    */
-  function summary_name($data) {
+  public function summary_name($data) {
     $created = $data->{$this->name_alias};
     return t('Week %week', array('%week' => $created));
   }
-}
 
+}
diff --git a/modules/views/civicrm/views_handler_argument_civicrm_year.inc b/modules/views/civicrm/views_handler_argument_civicrm_year.inc
index 68ea916..9422d16 100644
--- a/modules/views/civicrm/views_handler_argument_civicrm_year.inc
+++ b/modules/views/civicrm/views_handler_argument_civicrm_year.inc
@@ -21,7 +21,7 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  * Argument handler for a year (CCYY)
@@ -31,12 +31,12 @@ class views_handler_argument_civicrm_year extends views_handler_argument_date {
   /**
    * Constructor implementation
    */
-  function construct() {
+  public function construct() {
     parent::construct();
     $this->arg_format = 'Y';
-    $this->formula = views_date_sql_format('Y', "***table***.$this->real_field", "datetime",0);
+    $this->formula = views_date_sql_format('Y', "***table***.$this->real_field", "datetime", 0);
     //$this->formula = views_date_sql_extract('YEAR', "***table***.$this->real_field");
     // Any reason the above was used?
   }
-}
 
+}
diff --git a/modules/views/civicrm/views_handler_argument_civicrm_year_month.inc b/modules/views/civicrm/views_handler_argument_civicrm_year_month.inc
index 36ceb22..a36aefb 100644
--- a/modules/views/civicrm/views_handler_argument_civicrm_year_month.inc
+++ b/modules/views/civicrm/views_handler_argument_civicrm_year_month.inc
@@ -21,7 +21,7 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  * Argument handler for a year plus month (CCYYMM)
@@ -31,17 +31,17 @@ class views_handler_argument_civicrm_year_month extends views_handler_argument_d
   /**
    * Constructor implementation
    */
-  function construct() {
+  public function construct() {
     parent::construct();
     $this->format     = 'F Y';
     $this->arg_format = 'Ym';
-    $this->formula    = views_date_sql_format($this->arg_format, "***table***.$this->real_field", "datetime",0);
+    $this->formula    = views_date_sql_format($this->arg_format, "***table***.$this->real_field", "datetime", 0);
   }
 
   /**
    * Provide a link to the next level of the view
    */
-  function summary_name($data) {
+  public function summary_name($data) {
     $timestamp = $data->{$this->name_alias};
     $timestamp = strtotime($timestamp . " UTC");
     if ($timestamp !== FALSE) {
@@ -52,11 +52,11 @@ class views_handler_argument_civicrm_year_month extends views_handler_argument_d
   /**
    * Provide a link to the next level of the view
    */
-  function title() {
+  public function title() {
     $timestamp = strtotime($this->argument . " UTC");
     if ($timestamp !== FALSE) {
       return format_date($timestamp, 'custom', $this->format, 'UTC');
     }
   }
-}
 
+}

From fe47de66f02ec5f41ecb59a4339615bd58db353d Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Sun, 17 Sep 2017 12:47:20 +1000
Subject: [PATCH 27/86] Civilint civicrm_og_sync module

---
 .../civicrm_og_sync/civicrm_og_sync.install   |  92 +++++++++++
 .../civicrm_og_sync/civicrm_og_sync.module    | 156 ++++++------------
 2 files changed, 144 insertions(+), 104 deletions(-)
 create mode 100644 modules/civicrm_og_sync/civicrm_og_sync.install

diff --git a/modules/civicrm_og_sync/civicrm_og_sync.install b/modules/civicrm_og_sync/civicrm_og_sync.install
new file mode 100644
index 0000000..e820de9
--- /dev/null
+++ b/modules/civicrm_og_sync/civicrm_og_sync.install
@@ -0,0 +1,92 @@
+<?php
+/*
+ +--------------------------------------------------------------------+
+ | CiviCRM version 4.7                                                |
+ +--------------------------------------------------------------------+
+ | Copyright CiviCRM LLC (c) 2004-2017                                |
+ +--------------------------------------------------------------------+
+ | 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        |
+ +--------------------------------------------------------------------+
+ */
+
+/**
+ *
+ * @package CRM
+ * @copyright CiviCRM LLC (c) 2004-2017
+ * $Id$
+ *
+ */
+
+/**
+ * Implemenation of hook_enable.  Use to synchronise with pre-existing groups
+ */
+function civicrm_og_sync_enable() {
+  db_query("UPDATE {system} SET weight = 110 WHERE name = 'civicrm_og_sync'");
+
+  if (!civicrm_initialize()) {
+    return;
+  }
+
+  if (function_exists('og_get_group_ids')) {
+    $ogGroupIds = og_get_group_ids('node');
+  }
+  else {
+    $ogGroupIds = og_get_all_group('node');
+  }
+
+  // FIX ME
+  $subscribers = array();
+  // $subscribers = og_get_group_ids('user');
+
+  foreach ($ogGroupIds as $nid => $gid) {
+    $node = node_load($gid);
+    $title = trim($node->title);
+    // length of 49 so that the admin group can fit ': administrator' afterwards within 64 char field
+    $params = array(
+      'name' => substr(trim($title), 0, 49),
+      'title' => $title,
+      'is_active' => 1,
+      'og_id' => $gid,
+    );
+
+    _civicrm_og_sync_skip_process_request(TRUE);
+
+    // add the group
+    require_once 'CRM/Bridge/OG/Drupal.php';
+    CRM_Bridge_OG_Drupal::nodeapi($params, 'add');
+
+    // add the subscribers
+    foreach ($subscribers as $uid) {
+      $is_admin = FALSE;
+      if ($uid == $node->uid) {
+        $is_admin = TRUE;
+      }
+
+      $addToGroupParams = array(
+        'og_id' => $gid,
+        'uf_id' => $uid,
+        'is_active' => 1,
+        'is_admin' => $is_admin,
+      );
+
+      // add contact in group
+      CRM_Bridge_OG_Drupal::og($addToGroupParams, 'add');
+    }
+  }
+}
diff --git a/modules/civicrm_og_sync/civicrm_og_sync.module b/modules/civicrm_og_sync/civicrm_og_sync.module
index 9b1abcb..61a6e81 100644
--- a/modules/civicrm_og_sync/civicrm_og_sync.module
+++ b/modules/civicrm_og_sync/civicrm_og_sync.module
@@ -23,7 +23,7 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  *
@@ -55,19 +55,22 @@
 
 
 /**
- * Implementation of hook_node_update
- * Implementation of hook_node_insert
- * Implementation of hook_node_delete
- *
+ * Implements hook_node_update().
  */
 function civicrm_og_sync_node_insert($node) {
   _civicrm_og_sync_node_action($node);
 }
 
+/**
+ * Implements hook_node_insert().
+ */
 function civicrm_og_sync_node_update($node) {
   _civicrm_og_sync_node_action($node);
 }
 
+/**
+ * Implements hook_node_delete().
+ */
 function civicrm_og_sync_node_delete($node) {
   if (!_civicrm_og_sync_check_isvalid($node)) {
     return;
@@ -77,13 +80,14 @@ function civicrm_og_sync_node_delete($node) {
   $groupid = 0;
 
   if (function_exists('og_get_group')) {
-  if ($group = og_get_group('node', $node->nid)) {
-    if (empty($group->gid)) {
-      return;
-    }
-        $groupid = $group->gid;
+    if ($group = og_get_group('node', $node->nid)) {
+      if (empty($group->gid)) {
+        return;
+      }
+      $groupid = $group->gid;
     }
-  } else {
+  }
+  else {
     $groupid = $node->nid;
   }
 
@@ -91,17 +95,17 @@ function civicrm_og_sync_node_delete($node) {
     return;
   }
 
-    _civicrm_og_sync_skip_process_request(TRUE);
+  _civicrm_og_sync_skip_process_request(TRUE);
 
-    $params = array(
-      'name' => $node->title,
-      'title' => $node->title,
+  $params = array(
+    'name' => $node->title,
+    'title' => $node->title,
     'og_id' => $groupid,
-    );
+  );
 
-    CRM_Bridge_OG_Drupal::nodeapi($params, 'delete');
+  CRM_Bridge_OG_Drupal::nodeapi($params, 'delete');
 
-  }
+}
 
 function civicrm_og_sync_og_membership_insert($membership) {
   _civicrm_og_sync_group_action($membership, 'add');
@@ -186,65 +190,7 @@ function civicrm_og_sync_civicrm_post($op, $objectName, $objectID, $objectRef) {
 }
 
 /**
- * Implemenation of hook_enable.  Use to synchronise with pre-existing groups
- *
- * @return
- */
-function civicrm_og_sync_enable() {
-  db_query("UPDATE {system} SET weight = 110 WHERE name = 'civicrm_og_sync'");
-  
-  if (!civicrm_initialize()) {
-    return;
-  }
-
-  if (function_exists('og_get_group_ids')) {
-  $ogGroupIds = og_get_group_ids('node');
-  } else {
-    $ogGroupIds  =  og_get_all_group('node');
-  }
-
-  // FIX ME
-  $subscribers = array();
-  // $subscribers = og_get_group_ids('user');
-
-  foreach ($ogGroupIds as $nid => $gid) {
-    $node = node_load($gid);
-    $title = trim($node->title);
-    // length of 49 so that the admin group can fit ': administrator' afterwards within 64 char field
-    $params = array('name' => substr(trim($title), 0, 49),
-      'title' => $title,
-      'is_active' => 1,
-      'og_id' => $gid,
-    );
-
-    _civicrm_og_sync_skip_process_request(TRUE);
-
-    // add the group
-    require_once 'CRM/Bridge/OG/Drupal.php';
-    CRM_Bridge_OG_Drupal::nodeapi($params, 'add');
-
-    // add the subscribers
-    foreach ($subscribers as $uid) {
-      $is_admin = FALSE;
-      if ($uid == $node->uid) {
-        $is_admin = TRUE;
-      }
-
-      $addToGroupParams = array(
-        'og_id' => $gid,
-        'uf_id' => $uid,
-        'is_active' => 1,
-        'is_admin' => $is_admin,
-      );
-
-      // add contact in group
-      CRM_Bridge_OG_Drupal::og($addToGroupParams, 'add');
-    }
-  }
-}
-
-/*
- *Update or Add node 
+ * Update or Add node
  */
 function _civicrm_og_sync_node_action($node) {
   if (!_civicrm_og_sync_check_isvalid($node)) {
@@ -256,43 +202,44 @@ function _civicrm_og_sync_node_action($node) {
   $groupid = 0;
 
   if (function_exists('og_get_group')) {
-  if ($group = og_get_group('node', $node->nid)) {
-    if (empty($group->gid)) {
-      return;
-    }
+    if ($group = og_get_group('node', $node->nid)) {
+      if (empty($group->gid)) {
+        return;
+      }
       $groupid = $group->gid;
     }
-  } else {
+  }
+  else {
     $groupid = $node->nid;
   }
-  
+
   if ($groupid == 0) {
     return;
   }
 
-    $params = array(
-      'name' => $title,
-      'title' => $title,
-      'is_active' => 1,
+  $params = array(
+    'name' => $title,
+    'title' => $title,
+    'is_active' => 1,
     'og_id' => $groupid,
-    );
+  );
 
-    require_once 'CRM/Bridge/OG/Drupal.php';
+  require_once 'CRM/Bridge/OG/Drupal.php';
 
-    CRM_Bridge_OG_Drupal::nodeapi($params, 'add');
+  CRM_Bridge_OG_Drupal::nodeapi($params, 'add');
 
-    _civicrm_og_sync_skip_process_request(TRUE);
+  _civicrm_og_sync_skip_process_request(TRUE);
 
-    // also call the user hook since OG does not for admin
-    $params = array(
+  // also call the user hook since OG does not for admin
+  $params = array(
     'og_id' => $groupid,
-      'uf_id' => $node->uid,
-      'is_active' => 1,
-      'is_admin' => 1,
-    );
+    'uf_id' => $node->uid,
+    'is_active' => 1,
+    'is_admin' => 1,
+  );
 
-    CRM_Bridge_OG_Drupal::og($params, 'add');
-  }
+  CRM_Bridge_OG_Drupal::og($params, 'add');
+}
 
 function _civicrm_og_sync_group_action($membership, $op = 'add') {
   if ($membership->entity_type != 'user' || !civicrm_initialize() || _civicrm_og_sync_skip_process_request() || $membership->type == "trusted_contacts") {
@@ -303,7 +250,8 @@ function _civicrm_og_sync_group_action($membership, $op = 'add') {
 
   if (function_exists('og_load')) {
     $group = og_load($membership->gid);
-  } else {
+  }
+  else {
     // og-7.x-2.x does not have og_load, but uses entity_load_single($entity_type, $entity_id)
     // Right now we don't really know how to get a valid $entity_type for the group node, so we'll assume it's a node
     $group = entity_load_single('node', $membership->gid);
@@ -322,7 +270,8 @@ function _civicrm_og_sync_group_action($membership, $op = 'add') {
       'name' => substr(trim($group->title), 0, 49),
       'is_active' => 1,
     );
-  } else {
+  }
+  else {
     $createGroupParams = array(
       'og_id' => $group->gid,
       'title' => substr(trim($group->label), 0, 49),
@@ -345,8 +294,8 @@ function _civicrm_og_sync_group_action($membership, $op = 'add') {
   CRM_Bridge_OG_Drupal::og($addToGroupParams, $op);
 }
 
-/*
- *Check for context ,node type & civicrm initialization
+/**
+ * Check for context ,node type & civicrm initialization
  */
 function _civicrm_og_sync_check_isvalid($node) {
 
@@ -368,4 +317,3 @@ function _civicrm_og_sync_skip_process_request($skip = FALSE) {
   }
   return $_process_request;
 }
-

From bd996ce3c71adb4eb4918932cfcb2b0f27aa45a7 Mon Sep 17 00:00:00 2001
From: Samuel Vanhove <samuel@symbiotic.coop>
Date: Tue, 16 May 2017 22:08:16 -0400
Subject: [PATCH 28/86] CRM-20592 - remove location options from website field

---
 modules/views/civicrm/civicrm_handler_field_website.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/views/civicrm/civicrm_handler_field_website.inc b/modules/views/civicrm/civicrm_handler_field_website.inc
index da8354c..d76c384 100644
--- a/modules/views/civicrm/civicrm_handler_field_website.inc
+++ b/modules/views/civicrm/civicrm_handler_field_website.inc
@@ -28,7 +28,7 @@
  *
  * @ingroup civicrm_field_handlers
  */
-class civicrm_handler_field_website extends civicrm_handler_field_location {
+class civicrm_handler_field_website extends civicrm_handler_field {
   static $_websiteType;
 
   public function construct() {

From 175f3c9395b4ed6d865a1d6736f93a18ff9a843f Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Tue, 19 Sep 2017 06:18:45 +1000
Subject: [PATCH 29/86] Civilint civicrm_user.inc

---
 civicrm_user.inc | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/civicrm_user.inc b/civicrm_user.inc
index 7c2c58b..acc0274 100644
--- a/civicrm_user.inc
+++ b/civicrm_user.inc
@@ -42,9 +42,6 @@
 
 /**
  * Implements hook_user_login().
- *
- * @param $edit
- * @param $user
  */
 function civicrm_user_login(&$edit, $user) {
   if (!civicrm_initialize()) {
@@ -57,10 +54,6 @@ function civicrm_user_login(&$edit, $user) {
 
 /**
  * Implements hook_user_insert().
- *
- * @param $edit
- * @param $user
- * @param null $category
  */
 function civicrm_user_insert(&$edit, &$user, $category = NULL) {
   if (!civicrm_initialize()) {
@@ -85,9 +78,6 @@ function civicrm_user_insert(&$edit, &$user, $category = NULL) {
 
 /**
  * Implements hook_user_update().
- * @param $edit
- * @param $user
- * @param $category
  */
 function civicrm_user_update(&$edit, &$user, $category) {
   if (!civicrm_initialize()) {
@@ -120,7 +110,6 @@ function civicrm_user_update(&$edit, &$user, $category) {
 
 /**
  * Implements hook_user_delete().
- * @param $account
  */
 function civicrm_user_delete($account) {
   if (!civicrm_initialize()) {
@@ -151,7 +140,7 @@ function civicrm_user_categories() {
     if ($value['is_active']) {
       $name = $value['name'];
       foreach (array_reverse($urlParts) as $urlPart) {
-        if($urlPart == $name) {
+        if ($urlPart == $name) {
           continue;
         }
         elseif ($urlPart == $value['title']) {
@@ -180,8 +169,6 @@ function civicrm_user_categories() {
  *
  * @todo I suspect that some of the stuff done in the old form_alter handler
  *       should live here instead under D7
- * @param $user
- * @param $view_mode
  */
 function civicrm_user_view($user, $view_mode) {
   if (!civicrm_initialize()) {
@@ -272,7 +259,6 @@ function civicrm_user_view($user, $view_mode) {
 
 /**
  * Implements hook_user_logout().
- * @param $account
  */
 function civicrm_user_logout($account) {
   if (!civicrm_initialize()) {

From 582e4ce46a2fe65cb6ff4cfe9393e749d0731f20 Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Tue, 19 Sep 2017 09:04:03 +1000
Subject: [PATCH 30/86] Remove CiviTest.module.sample as been replaced with the
 CiviCRM Dev Docs

---
 civitest.module.sample | 2041 ----------------------------------------
 1 file changed, 2041 deletions(-)
 delete mode 100644 civitest.module.sample

diff --git a/civitest.module.sample b/civitest.module.sample
deleted file mode 100644
index 624c40e..0000000
--- a/civitest.module.sample
+++ /dev/null
@@ -1,2041 +0,0 @@
-<?php
-
-function civitest_civicrm_pre( $op, $objectName, $objectId, &$objectRef ) {
-  // Sample implementation of pre hook on line item row create. Available as of 4.1 beta3
-  if ( $objectName == 'LineItem' && $op == 'create' ) {
-    //if text type field and quantity is greater than 5, let's apply a discount
-    if ( $objectRef['html_type'] == 'Text' &&
-      $objectRef['qty'] > 5 ) {
-
-      //5% discount
-      $discount = 1 - 0.05;
-
-      $objectRef['unit_price'] = $objectRef['unit_price'] * $discount;
-      $objectRef['line_total'] = $objectRef['line_total'] * $discount;
-
-      //we would also need to update the total amount
-      //we know the table impacted with $objectRef['entity_table']
-      //and the contrib/event id with $objectRef['entity_id']
-    }
-  }
-}
-
-function civitest_civicrm_post( $op, $objectName, $objectId, &$objectRef ) {
-  // only interested in the profile object and create operation for now
-  if ( $objectName != 'Profile' || ( $op != 'create' && $op != 'edit' ) ) {
-    // send it to custom hook
-    return false;
-  }
-
-  // send an email to the user and cc administrator
-  // with a welcome message
-  civicrm_initialize( true );
-
-  require_once 'CRM/Utils/Mail.php';
-
-  $params         = array( );
-  $fromName       = 'My Org Administrator';
-  $fromEmail      = 'info@example.org';
-  $params['from'] = '"' . $fromName . '" <' . $fromEmail . '>';
-
-  $params['toEmail']     = $objectRef['email-1'];
-  $params['toName']      = "{$objectRef['first_name']} {$objectRef['last_name']}";
-  $params['subject']     = "Thank you for supporting My Org";
-  $params['cc']          = 'myorg@example.org';
-  $objectValues          = print_r( $objectRef, true );
-  $params['text'] = "
-Dear $toName:
-
-Thank you for your show of support. The details u signed up with are:
-
-$objectValues
-
-Regards
-
-My Org Team
-";
-
-  CRM_Utils_Mail::send( $params );
-}
-
-function civitest_civicrm_custom( $op, $groupID, $entityID, &$params ) {
-  if ( $op != 'create' && $op != 'edit' ) {
-    return;
-  }
-
-  // this is the custom group i am interested in updating when the row is updated
-  if ( $groupID != 1 ) {
-    return;
-  }
-
-  $tableName = CRM_Core_DAO::getFieldValue( 'CRM_Core_DAO_CustomGroup',
-               $groupID,
-               'table_name' );
-  $sql = "
-UPDATE $tableName
-SET    random_code_data_3 = 23
-WHERE  entity_id = $entityID
-";
-  CRM_Core_DAO::executeQuery( $sql,
-    CRM_Core_DAO::$_nullArray );
-}
-
-/**
- * Get the permissioned where clause for the user
- *
- * @param int $type the type of permission needed
- * @param  array $tables (reference ) add the tables that are needed for the select clause
- * @param  array $whereTables (reference ) add the tables that are needed for the where clause
- * @param int    $contactID the contactID for whom the check is made
- *
- * @return string the group where clause for this user
- * @access public
- */
-function civitest_civicrm_aclWhereClause( $type, &$tables, &$whereTables, &$contactID, &$where ) {
-  if ( ! $contactID ) {
-    return;
-  }
-
-  $permissionTable = 'civicrm_value_permission';
-  $regionTable     = 'civicrm_value_region';
-  $fields          = array( 'electorate' => 'Integer',
-                     'province'   => 'Integer',
-                     'branch'     => 'Integer' );
-
-  // get all the values from the permission table for this contact
-  $keys = implode( ', ', array_keys( $fields ) );
-  $sql = "
-SELECT $keys
-FROM   {$permissionTable}
-WHERE  entity_id = $contactID
-";
-  $dao = CRM_Core_DAO::executeQuery( $sql );
-  if ( ! $dao->fetch( ) ) {
-    return;
-  }
-
-  $tables[$regionTable] = $whereTables[$regionTable] =
-    "LEFT JOIN {$regionTable} regionTable ON contact_a.id = regionTable.entity_id";
-
-  $clauses = array( );
-  foreach( $fields as $field => $fieldType ) {
-    if ( ! empty( $dao->$field ) ) {
-      if ( strpos( CRM_Core_DAO::VALUE_SEPARATOR, $dao->$field ) !== false ) {
-        $value = substr( $dao->$field, 1, -1 );
-        $values = explode( CRM_Core_DAO::VALUE_SEPARATOR, $value );
-        foreach ( $values as $v ) {
-          $clauses[] = "regionTable.{$field} = $v";
-        }
-      } else {
-        if ( $fieldType == 'String' ) {
-          $clauses[] = "regionTable.{$field} = '{$dao->$field}'";
-        } else {
-          $clauses[] = "regionTable.{$field} = {$dao->$field}";
-        }
-      }
-    }
-  }
-
-  if ( ! empty( $clauses ) ) {
-    if ( ! empty( $where )  ) {
-      $where .= ' AND (' . implode( ' OR ', $clauses ) . ')';
-    } else {
-      $where .= ' (' . implode( ' OR ', $clauses ) . ')';
-    }
-  }
-}
-
-function civitest_civicrm_dashboard( $contactID, &$contentPlacement ) {
-  // REPLACE Activity Listing with custom content
-  $contentPlacement = 3;
-  return array( 'Custom Content' => "Here is some custom content: $contactID",
-    'Custom Table' => "
-<table>
-<tr><th>Contact Name</th><th>Date</th></tr>
-<tr><td>Foo</td><td>Bar</td></tr>
-<tr><td>Goo</td><td>Tar</td></tr>
-</table>
-",
-  );
-}
-
-function civitest_civicrm_buildAmount(
-  $pageType,
-  &$form,
-  &$amount
-) {
-  //sample to modify priceset fee
-  $priceSetId = $form->get( 'priceSetId' );
-  if ( !empty( $priceSetId ) ) {
-    $feeBlock =& $amount;
-
-    // if you use this in sample data, u'll see changes in
-    // contrib page id = 1, event page id = 1 and
-    // contrib page id = 2 (which is a membership page
-
-    if (!is_array( $feeBlock ) || empty( $feeBlock ) ) {
-      return;
-    }
-
-    //in case of event we get eventId,
-    //so lets apply hook for eventId = 1
-    if ( $pageType == 'event' && $form->_eventId != 1 ) {
-      return;
-    }
-
-    //in case of contrbution
-    //for online case we get page id so we could apply for specific
-    if ( $pageType == 'contribution' ) {
-      if ( !in_array(
-          get_class( $form ),
-          array( 'CRM_Contribute_Form_Contribution', 'CRM_Contribute_Form_Contribution_Main')
-          )
-      ) {
-        return;
-      }
-    }
-
-    if ($pageType == 'membership') {
-      // give a discount of 20% to everyone
-      foreach ( $feeBlock as &$fee ) {
-        if ( !is_array( $fee['options'] ) ) {
-          continue;
-        }
-        foreach ( $fee['options'] as &$option ) {
-          //for sample lets modify first option from all fields.
-          $option['amount']  = $option['amount'] * 0.8;
-          $option['label']  .= ' - ' . ts( 'Get a 20% discount since you know this hook' );
-        }
-      }
-    } else {
-      // unconditionally modify the first option to be a $100 fee
-      // to show our power!
-      foreach ( $feeBlock as &$fee ) {
-        if ( !is_array( $fee['options'] ) ) {
-          continue;
-        }
-        foreach ( $fee['options'] as &$option ) {
-          // lets modify first option from all fields.
-          $option['amount'] = 100;
-          $option['label']  = ts( 'Power of hooks' );
-          break;
-        }
-      }
-    }
-  }
-}
-
-function civitest_civicrm_aclGroup( $type, $contactID, $tableName, &$allGroups, &$currentGroups ) {
-  // only process saved search
-  if ( $tableName != 'civicrm_saved_search' ) {
-    return;
-  }
-
-  hrd_initialize( );
-
-  $currentGroups = $allGroups;
-
-  if ( ! CRM_Core_Permission::check( 'access secure contacts' ) ) {
-    unset( $currentGroups[HRD_SECURE_GROUP_ID] );
-  }
-
-  $currentGroups = array_keys( $currentGroups );
-}
-
-function civitest_civicrm_tabs( &$tabs, $contactID ) {
-
-  // unset the contribition tab
-  unset( $tabs[1] );
-
-  // lets rename the contribution tab with a differnt name and put it last
-  // this is just a demo, in the real world, you would create a url which would
-  // return an html snippet etc
-  $url = CRM_Utils_System::url( 'civicrm/contact/view/contribution',
-         "reset=1&snippet=1&force=1&cid=$contactID" );
-  $tabs[] = array( 'id'    => 'mySupercoolTab',
-            'url'   => $url,
-            'title' => 'Contribution Tab Renamed',
-            'weight' => 300 );
-}
-
-function civitest_civicrm_enableDisable( $recordBAO, $recordID, $isActive ) {
-  // create an activity for enable/disable relationship type
-  if ( $recordBAO == 'CRM_Contact_BAO_RelationshipType' ) {
-    $session = CRM_Core_Session::singleton( );
-    $uid     = $session->get('userID');
-    if( $uid ) {
-      $params = array( 'activity_type_id'   => 1,
-                'source_contact_id'  => $uid,
-                'status_id'          => 2,
-                'activity_date_time' => date('YmdHis')
-      );
-      if( $isActive ) {
-        $params['subject'] = ts('Enabled relationship type.');
-      } else {
-        $params['subject'] = ts('Disabled relationship type.');
-      }
-      civicrm_api('activity', 'create', $params);
-    }
-  }
-}
-
-function civitest_civicrm_tokens( &$tokens ) {
-  $tokens['contribution'] =
-    array(
-      'contribution.amount'                    => 'Amount of contribution',
-      'contribution.date'                      => 'Date of contribution',
-      'contribution.total_last_year'           => 'Total amount contributed last year',
-      'contribution.date_of_first'             => 'Date of first contribution',
-      'contribution.largest_this_year'         => 'Largest this Year Contribution Amount',
-      'contribution.date_of_largest_this_year' => 'Largest this Year Contribution Date',
-      'contribution.average'                   => 'Average Contribution Amount',
-      'contribution.largest'                   => 'Largest Contribution' );
-}
-
-function civitest_civicrm_tokenValues( &$values,
-  &$contactIDs,
-  $dontCare,
-  $tokens,
-  $context ) {
-  if ( is_array( $contactIDs ) ) {
-    $contactIDString = implode( ',', array_values( $contactIDs ) );
-  }
-
-  $query = "
-SELECT sum( total_amount ) as total_amount,
-       contact_id,
-       max( receive_date ) as receive_date
-FROM   civicrm_contribution
-WHERE  contact_id IN ( $contactIDString )
-AND    is_test = 0
-GROUP BY contact_id
-";
-
-  $dao = CRM_Core_DAO::executeQuery( $query );
-  while ( $dao->fetch( ) ) {
-    if ( ! array_key_exists( $dao->contact_id, $values ) ) {
-      $values[$dao->contact_id] = array( );
-    }
-    $values[$dao->contact_id]['contribution.amount'] = $dao->total_amount;
-    $values[$dao->contact_id]['contribution.date'  ] = $dao->receive_date;
-  }
-}
-
-// example of token that does not depend on contactID
-// and using the new format
-function civitest_civicrm_tokenValues( &$values,
-  &$contactIDs,
-  $dontCare,
-  $tokens,
-  $context ) {
-  if ( isset( $tokens['views'] ) ) {
-    static $_cache = null;
-
-    if ( ! $_cache ) {
-      $_cache = array( );
-      foreach( $tokens['views'] as $token ) {
-        $_cache[$token] = CALL_YOUR_OWN_FUNCTION_TO_RENDER_THIS_VIEW( $token );
-      }
-    }
-
-    foreach( $contactIDs as $cid ) {
-      foreach( $tokens['views'] as $token ) {
-        $values[$cid]["views.{$token}"] = $_cache[$token];
-      }
-    }
-  }
-}
-
-function civitest_civicrm_pageRun( &$page ) {
-  // You can assign variables to the template using:
-  // $page->assign( 'varName', $varValue );
-  // in your template, {$varName} will output the contents of $varValue
-  // you should customize your template if doing so
-
-  $page->assign( 'varName', 'This is a variable assigned by the hook' );
-}
-
-/*
- * The hook_nodeapi implementation to set the node title to that of event title.
- * Could also be used set the title to anything we want.
- *
- */
-function civicrm_nodeapi(&$node, $op, $teaser = NULL, $page = NULL) {
-  if ($op == 'load' && $node->type == 'event') {
-    $node->title = civicrm_cck_event_field_values('title', $node->field_title[0]['value']);
-  }
-}
-
-/*
- * The function to pull out event data from civicrm for cck fields related to event.
- *
- */
-function civicrm_cck_event_field_values($field, $index = null) {
-  static $eventInfo;
-  if ( ! $eventInfo ) {
-    if ( ! civicrm_initialize( ) ) {
-      return;
-    }
-    $params    = array( );
-    $eventInfo = civicrm_api('event', 'get', $params );
-  }
-
-  if ( strpos($_GET['q'], 'edit') ||
-    strpos($_GET['q'], 'add')  ) {
-    $isAppend = true;
-  }
-  if ( isset( $index ) ) {
-    $isAppend = false;
-  }
-
-  $retArray = array( );
-  switch( $field ) {
-    case 'when':
-      foreach ( $eventInfo as $info ) {
-        $str = "{$info['start_date']} >  through > {$info['end_date']}";
-        $retArray[] = $isAppend ? ("{$info['title']}:: " . $str) : $str;
-      }
-      break;
-
-    case 'location':
-      foreach ( $eventInfo as $info ) {
-        $params = array( 'entity_id' => $info['id'],'entity_table' => 'civicrm_event');
-        require_once 'CRM/Core/BAO/Location.php';
-        $values['location'] = CRM_Core_BAO_Location::getValues( $params, true );
-        $str = $values['location']['address'][1]['display'];
-        $retArray[] = $isAppend ? ("{$info['title']}:: " . $str) : $str;
-      }
-      break;
-
-    case 'register_link':
-      foreach ( $eventInfo as $info ) {
-        $str = '<a href="' .
-          CRM_Utils_System::url( 'civicrm/event/register',
-            "id={$info['id']}&reset=1", true ) .
-          '">&raquo; Register Now</a>';
-        $retArray[] = $isAppend ? ("{$info['title']}:: " . $str) : $str;
-      }
-      break;
-
-    case 'feeblock' :
-      require_once 'CRM/Core/BAO/Discount.php';
-      require_once 'CRM/Core/OptionGroup.php';
-      foreach ( $eventInfo as $info ) {
-        $discountId = CRM_Core_BAO_Discount::findSet( $info['id'], 'civicrm_event' );
-        if ( $discountId ) {
-          CRM_Core_OptionGroup::getAssoc( CRM_Core_DAO::getFieldValue( 'CRM_Order_DAO_Discount',
-              $discountId, 'option_group_id' ),
-            $feeBlock, true, 'id' );
-        } else {
-          CRM_Core_OptionGroup::getAssoc( "civicrm_event.amount.{$info['id']}", $feeBlock, true );
-        }
-
-        $feeLabels = array();
-        foreach ( $feeBlock as $block ) {
-          $feeLabels[] = $block['label'] . "  $" . $block['value'];
-        }
-        $str  = '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;' . implode($feeLabels, '<br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;');
-        $retArray[] = $isAppend ? ("{$info['title']}:: " . $str) : $str;
-      }
-      break;
-
-    default:
-      foreach ( $eventInfo as $info ) {
-        if ( isset($info[$field]) ) {
-          $str = $info[$field];
-          $retArray[] = $isAppend ? ("{$info['title']}:: " . $str) : $str;
-        }
-      }
-  }
-  return empty($retArray) ? array() : isset($index) ? $retArray[$index] : $retArray;
-}
-
-function civitest_civicrm_customFieldOptions( $fieldID, &$options ) {
-  if ( $fieldID == 1 ) {
-    $options['Rocks'] = t( 'Hooks Rock' );
-    unset( $options['Edu'] );
-  } else if ( $fieldID == 2 ) {
-    $options['H'] = t(' Hook me' );
-    unset( $options['S'] );
-  }
-}
-
-/**
- * The hook_searchTasks is implemented to display the list of actions allowed after doing a search
- * More examples are shown to call this hook
- *
- * @param string $$objectType specifies the component
- * @param array  $tasks       the list of actions
- *
- * @access public
- */
-function civitest_civicrm_searchTasks( $objectType, &$tasks ) {
-  if ( $objectType == 'contact' ) {
-    $tasks[100] = array( 'title'  => t( 'Contact Hook Action Task' ),
-                  'class'  => 'CRM_Contact_Form_Task_HookSample',
-                  'result' => false );
-  }
-  if ( $objectType == 'contribution' ) {
-    $tasks[102] = array( 'title'  => t( 'Contribution Hook Action Task' ),
-                  'class'  => 'CRM_Contribute_Form_Task_SearchTaskHookSample',
-                  'result' => false );
-  }
-  if ( $objectType == 'membership' ) {
-    $tasks[103] = array( 'title'  => t( 'Member Hook Action Task' ),
-                  'class'  => 'CRM_Member_Form_Task_SearchTaskHookSample',
-                  'result' => false );
-  }
-  if ( $objectType == 'pledge' ) {
-    $tasks[104] = array( 'title'  => t( 'Pledge Hook Action Task' ),
-                  'class'  => 'CRM_Pledge_Form_Task_SearchTaskHookSample',
-                  'result' => false );
-  }
-  if ( $objectType == 'event' ) {
-    $tasks[105] = array( 'title'  => t( 'Event Hook Action Task' ),
-                  'class'  => 'CRM_Event_Form_Task_SearchTaskHookSample',
-                  'result' => false );
-  }
-  if ( $objectType == 'case' ) {
-    $tasks[106] = array( 'title'  => t( 'Case Hook Action Task' ),
-                  'class'  => 'CRM_Case_Form_Task_SearchTaskHookSample',
-                  'result' => false );
-  }
-  if ( $objectType == 'grant' ) {
-    $tasks[107] = array( 'title'  => t( 'Grant Hook Action Task' ),
-                  'class'  => 'CRM_Grant_Form_Task_SearchTaskHookSample',
-                  'result' => false );
-  }
-  if ( $objectType == 'activity' ) {
-    $tasks[108] = array( 'title'  => t( 'Activity Hook Action Task' ),
-                  'class'  => 'CRM_Activity_Form_Task_SearchTaskHookSample',
-                  'result' => false );
-  }
-}
-
-function civitest_civicrm_validateForm( $formName, &$fields, &$files, &$form, &$errors ) {
-  // sample implementation
-  if ( $formName == 'CRM_Contact_Form_Contact' ) {
-    // ensure that external identifier is present and valid
-    $externalID = CRM_Utils_Array::value( 'external_identifier', $fields );
-    if ( ! $externalID ) {
-      $errors['external_identifier'] = ts( 'External Identifier is a required field' );
-    } else {
-      require_once "CRM/Utils/Rule.php";
-      if ( ! CRM_Utils_Rule::integer( $externalID ) ) {
-        $errors['external_identifier'] = ts( 'External Identifier is not an integer' );
-      }
-    }
-  }
-  return;
-
-}
-
-function civitest_civicrm_pageRun( &$page ) {
-  // we are only interested in profile pages with gid = 1 and have a valid contact id
-  if ( $page->getVar( '_name' ) != 'CRM_Profile_Page_View' ||
-    $page->getVar( '_gid' ) != 1 ||
-    ! CRM_Utils_Rule::positiveInteger( $page->getVar( '_id' ) ) ) {
-    return;
-  }
-
-  // get all relationships of
-  require_once 'CRM/Contact/BAO/Relationship.php';
-  $relationships = CRM_Contact_BAO_Relationship::getRelationship( $page->getVar( '_id' ) );
-
-  // if you want to filter and display only certain relationship, you can do so before assigninng to
-  // smarty. Do a CRM_Core_Error::debug( $relationships ) to see all the fields
-  $page->assign( 'relationships', $relationships );
-
-  // in addition to this, you also need to customize: templates/CRM/Profile/Page/View.tpl
-  // check: http://wiki.civicrm.org/confluence/display/CRMDOC/Customize+Built-in,+Profile,+Contribution+and+Event+Registration+Screens
-  // some sample tpl code is included here, modify as needed
-  /**
-     {if $relationships}
-     <table>
-     <tr>
-     <th>Name</th>
-     <th>Relation</th>
-     <th>Country</th>
-     </tr>
-     {foreach from=$relationships item=relation}
-     <tr>
-     <td>{$relation.name}</td>
-     <td>{$relation.relation}</td>
-     <td>{$relation.country}</td>
-     </tr>
-     {/foreach}
-     </table>
-     {/if}
-  **/
-
-}
-
-function civitest_civicrm_eventDiscount( &$form, &$params ) {
-  require_once 'CRM/Utils/Money.php';
-
-  // we only are interested in event id 1
-  if ( $form->getVar( '_eventId' ) != 1 ) {
-    return;
-  }
-
-  $numParticipants = 0;
-  foreach ( $params as $key => $value ) {
-    if ( isset( $params[$key]['amount'] ) &&
-      $params[$key]['amount'] > 0 ) {
-      $numParticipants++;
-    }
-  }
-
-  // Set discount rule (Example: if more than 1 participant, 5% additional discount per paying participant, upto a max of 50%)
-  if ( $numParticipants > 1 ) {
-    $discountPercentage = $numParticipants * 5;
-
-    if ( $discountPercentage > 50 ) {
-      $discountPercentage = 50;
-    }
-
-    $totalDiscount = 0;
-    foreach ( $params as $key => $value ) {
-      if ( CRM_Utils_Array::value( 'amount', $params[$key] ) > 0 ) {
-        $discount = round( ( $params[$key]['amount'] * $discountPercentage ) / 100.0 );
-        $totalDiscount += $discount;
-        $params[$key]['discountAmount']  = $discount;
-        $discountDisplay = CRM_Utils_Money::format( $discount, null, null );
-        // Set discount info added to participant.fee_level and contribution.amount_level
-        $params[$key]['discountMessage'] = " (discount: $discountDisplay)";
-      }
-    }
-
-    $totalDiscountDisplay = CRM_Utils_Money::format( $totalDiscount, null, null );
-    // Set the message to show on confirmation page, thank-you page and receipt
-    $params[0]['discount'] =
-      array( 'message' => "a discount of $totalDiscountDisplay has been applied to the total amount",
-        'applied' => true );
-  }
-}
-
-
-/**
- * buildForm hook sample
- *
- * we want the custom date to be today's date. custom_3 is marriage date
- * in the sample data
- */
-function civitest_civicrm_buildForm( $formName, &$form ) {
-
-  if ( $formName == 'CRM_Contact_Form_Contact' ) {
-    $defaults['custom_3_-1'] = date('m/d/Y');
-    $form->setDefaults( $defaults );
-  }
-
-  // enable tracking feature
-  if ( ( $formName == 'CRM_Contribute_Form_Contribution_Main' ||
-      $formName == 'CRM_Contribute_Form_Contribution_Confirm' ||
-      $formName == 'CRM_Contribute_Form_Contribution_ThankYou' ) &&
-    $form->getVar( '_id' ) == 1 ) { // use  CONTRIBUTION PAGE ID here
-    // use the custom field ID and custom field label here
-    $trackingFields = array( 'custom_4' => 'Campaign',
-                      'custom_5' => 'Appeal',
-                      'custom_6' => 'Fund' );
-    $form->assign( 'trackingFields', $trackingFields );
-  }
-
-}
-
-/**
- * buildForm hook that would allow contacts to renew only existing memberships.
- */
-function civitest_civicrm_buildForm( $formName, &$form ) {
-  if ( $formName == 'CRM_Contribute_Form_Contribution_Main' ) {
-    if ( is_array( $form->_membershipBlock ) ) {
-      //get logged in contact
-      $session   = CRM_Core_Session::singleton();
-      $contactID = $session->get('userID');
-
-      //check for existing membership
-      $query = "SELECT membership_type_id
-                      FROM civicrm_membership
-                      WHERE membership_type_id IN ( {$form->_membershipBlock['membership_types']} )
-                         AND civicrm_membership.contact_id = {$contactID}";
-      $dao = CRM_Core_DAO::executeQuery( $query );
-
-      $membershipTypeID = null;
-      while ( $dao->fetch( ) ) {
-        $membershipTypeID = $dao->membership_type_id;
-      }
-
-      if ( $membershipTypeID ) {
-        $form->freeze(array('selectMembership'));
-        $defaults['selectMembership'] = $membershipTypeID;
-        $form->setDefaults( $defaults );
-      }
-    }
-  }
-}
-
-function civitest_civicrm_mailingGroups( &$form, &$groups, &$mailings ) {
-  unset( $groups[4] );
-  $mailings[1] = 'This Mailing does not exist';
-}
-
-function _civitest_discountHelper( $eventID, $discountCode ) {
-  $sql = "
-SELECT v.id as id, v.value as value, v.weight as weight
-FROM   civicrm_option_value v,
-       civicrm_option_group g
-WHERE  v.option_group_id = g.id
-AND    v.name = %1
-AND    g.name = %2
-
-";
-  $params = array( 1 => array( $discountCode              , 'String' ),
-            2 => array( "event_discount_{$eventID}", 'String' ) );
-  $dao = CRM_Core_DAO::executeQuery( $sql, $params );
-  if ( $dao->fetch( ) ) {
-    // ensure discountPercent is a valid numeric number <= 100
-    if ( $dao->value &&
-      is_numeric( $dao->value ) &&
-      $dao->value >= 0 &&
-      $dao->value <= 100 &&
-      is_numeric( $dao->weight ) ) {
-      return array( $dao->id, $dao->value, $dao->weight );
-    }
-  }
-  return array( null, null, null );
-
-}
-
-function civitest_civicrm_buildForm( $formName, &$form ) {
-  if ( $formName == 'CRM_Event_Form_Registration_Register' &&
-    $form->getVar( '_eventId' ) == 3 ) {
-    $form->addElement( 'text', 'discountCode', ts( 'Discount Code' ) );
-    // in template use
-    // {$form.discountCode.label}&nbsp;{$form.discountCode.html}
-
-    // also assign to template
-    $template = CRM_Core_Smarty::singleton( );
-    $beginHookFormElements = $template->get_template_vars( 'beginHookFormElements' );
-    if ( ! $beginHookFormElements ) {
-      $beginHookFormElements = array( );
-    }
-    $beginHookFormElements[] = 'discountCode';
-    $form->assign( 'beginHookFormElements', $beginHookFormElements );
-
-    $discountCode = CRM_Utils_Request::retrieve( 'discountCode', 'String', $form, false, null, $_REQUEST );
-    if ( $discountCode ) {
-      $defaults = array( 'discountCode' => $discountCode );
-      $form->setDefaults( $defaults );
-    }
-  }
-}
-
-/*
- * Give random discounts for event signup.
- *
- * Warning : while implementing this hook, another post process hook
- *         : also need implementing to make sure code is only used for
- *         : the number of times that's allowed to.
- */
-function civitest_civicrm_buildAmount( $pageType,
-  &$form,
-  &$amount ) {
-
-  $eventID = $form->getVar( '_eventId' );
-  if ( $pageType != 'event' ||
-    $eventID != 3 ) {
-    return;
-  }
-
-  $discountCode = CRM_Utils_Request::retrieve( 'discountCode', 'String', $form, false, null, $_REQUEST );
-  if ( ! $discountCode ) {
-    return;
-  }
-
-  list( $discountID, $discountPercent, $discountNumber ) = _civitest_discountHelper( $eventID, $discountCode );
-  if ( $discountNumber <= 0 ) {
-    // no more discount left
-    return;
-  }
-
-  foreach ( $amount as $amountId => $amountInfo ) {
-    $amount[$amountId]['value'] = $amount[$amountId]['value'] -
-      ceil($amount[$amountId]['value'] * $discountPercent / 100);
-    $amount[$amountId]['label'] = $amount[$amountId]['label'] .
-      "\t - with {$discountPercent}% discount";
-  }
-}
-
-/*
- * The hook updates the random code used with event signup.
- */
-function civitest_civicrm_postProcess( $class, &$form ) {
-  $eventID = $form->getVar( '_eventId' );
-  if ( ! is_a($form, 'CRM_Event_Form_Registration_Confirm') ||
-    $eventID != 3 ) {
-    return;
-  }
-
-  $discountCode = CRM_Utils_Request::retrieve( 'discountCode', 'String', $form, false, null, $_REQUEST );
-  if ( ! $discountCode ) {
-    return;
-  }
-
-  list( $discountID, $discountPercent, $discountNumber ) = _civitest_discountHelper( $eventID, $discountCode );
-  if ( ! $discountID ||
-    $discountNumber <= 0 ||
-    $discountNumber == 123456789 ) {
-    return;
-  }
-
-  $query = "
-UPDATE civicrm_option_value v
-SET    v.weight = v.weight - 1
-WHERE  v.id = %1
-AND    v.weight > 0
-";
-  $params = array( 1 => array( $discountID, 'Integer' ) );
-
-  CRM_Core_DAO::executeQuery( $query, $params );
-}
-
-/**
- * Sample hook to add more actions for Create New
- */
-function civitest_civicrm_links( $op, $objectName, $objectId, &$links, &$mask ) {
-  if ( $op == 'create.new.shorcuts' ) {
-    // add link to create new profile
-    $links[] = array( 'url'   => '/civicrm/admin/uf/group?action=add&reset=1',
-               'title' => ts('New Profile'),
-               'ref'   => 'new-profile');
-  }
-}
-
-function civitest_civicrm_membershipTypeValues( &$form, &$membershipTypeValues ) {
-  $membershipTypeValues[1]['name']        = 'General (50% discount)';
-  $membershipTypeValues[1]['minimum_fee'] = '50.00';
-
-  $membershipTypeValues[2]['name']        = 'Student (50% discount)';
-  $membershipTypeValues[2]['minimum_fee'] = '25.00';
-}
-
-function civitest_civicrm_summary( $contactID, &$content, &$contentPlacement ) {
-  // REPLACE default Contact Summary with your customized content
-  $contentPlacement = 3;
-  $content = "
-<table>
-<tr><th>Hook Data</th></tr>
-<tr><td>Data 1</td></tr>
-<tr><td>Data 2</td></tr>
-</table>
-";
-
-}
-
-function civitest_civicrm_contactListQuery( &$query, $name, $context, $id ) {
-  // This example limits contacts in my contact reference field lookup to a specific group
-
-  // Connect the hook to your Contact Reference custom field using the field ID (field id is 4 in this case)
-  if ( $context == 'customfield' &&
-    $id == 4 ) {
-    // Now construct the query to select only the contacts we want
-    // The query must return two columns - contact sort_name, and contact id
-    $query = "
-SELECT c.sort_name, c.id
-FROM civicrm_contact c, civicrm_group_contact cg
-WHERE c.sort_name LIKE '$name%'
-AND   cg.group_id IN ( 4 )
-AND   cg.contact_id = c.id
-AND   cg.status = 'Added'
-ORDER BY c.sort_name ";
-  }
-
-}
-
-/**
- * Hook implementation for altering payment parameters before talking to a payment processor back end.
- *
- * @param string $paymentObj
- *    instance of payment class of the payment processor invoked (e.g., 'CRM_Core_Payment_Dummy')
- * @param array &$rawParams
- *    array of params as passed to to the processor
- * @params array  &$cookedParams
- *     params after the processor code has translated them into its own key/value pairs
- * @return void
- */
-function civitest_civicrm_alterPaymentProcessorParams($paymentObj,
-  &$rawParams,
-  &$cookedParams) {
-
-  if ($paymentObj->class_name == Payment_Dummy ) {
-    $employer   = empty($rawParams['custom_1']) ? '' : $rawParams['custom_1'];
-    $occupation = empty($rawParams['custom_2']) ? '' : $rawParams['custom_2'];
-    $cookedParams['custom'] = "$employer|$occupation";
-
-  }
-  else if ($paymentObj->class_name == Payment_AuthorizeNet) {
-    //Actual translation for one application:
-    //Employer > Ship to Country (x_ship_to_country)
-    //Occupation > Company (x_company)
-    //Solicitor > Ship-to First Name (x_ship_to_first_name)
-    //Event > Ship-to Last Name (x_ship_to_last_name)
-    //Other > Ship-to Company (x_ship_to_company)
-
-    $cookedParams['x_ship_to_country']   = $rawParams['custom_1'];
-    $cookedParams['x_company']           = $rawParams['custom_2'];
-    $cookedParams['x_ship_to_last_name'] = $rawParams['accountingCode']; //for now
-    $country_info = da_core_fetch_country_data_by_crm_id($rawParams['country-1']);
-    $cookedParams['x_ship_to_company']   = $country_info['iso_code'];
-  }
-   elseif ($paymentObj->billing_mode == 2) {
-
-    // Express  Checkout
-    $cookedParams['desc']   = $rawParams['eventName'];
-    $cookedParams['custom'] = $rawParams['eventId'];
-  }
-}
-
-function civitest_civicrm_customFieldOptions($fieldID, &$options, $detailedFormat = false ) {
-  if ( $fieldID == 1 || $fieldID == 2 ) {
-    if ( $detailedFormat ) {
-      $options['fake_id_1'] = array( 'id'    => 'fake_id_1',
-                              'value' => 'XXX',
-                              'label' => 'XXX' );
-      $options['fake_id_2'] = array( 'id'    => 'fake_id_2',
-                              'value' => 'YYY',
-                              'label' => 'YYY' );
-    } else {
-      $options['XXX'] = 'XXX';
-      $options['YYY'] = 'YYY';
-    }
-  }
-}
-
-function civitest_civicrm_config( &$config ) {
-  $civitestRoot = dirname( __FILE__ ) . DIRECTORY_SEPARATOR;
-
-  // fix php include path
-  $include_path = $civitestRoot . PATH_SEPARATOR . get_include_path( );
-  set_include_path( $include_path );
-
-  // fix template path
-  $templateDir = $civitestRoot . 'templates' . DIRECTORY_SEPARATOR;
-  $template = CRM_Core_Smarty::singleton( );
-  array_unshift( $template->template_dir, $templateDir );
-}
-
-function custom_ts( $string, $params = array( ) ) {
-  $string = str_replace( 'Participant', 'Delegate', $string );
-
-  static $i18n = null;
-  if ( ! $i18n ) {
-    $i18n = CRM_Core_I18n::singleton();
-  }
-  return $i18n->crm_translate( $string, $params );
-}
-
-/**
- * You want a contribution page with exactly one amount and you
- * you want to set all the values fixed and not give the user
- * any choice
- */
-function civitest_civicrm_buildForm( $formName, &$form ) {
-  if ( $formName == 'CRM_Contribute_Form_Contribution_Main' &&
-    $form->getVar( '_id' ) == 1 ) {
-    // 358 is the "option value id" of the only  value in the amount table,
-    // you can get this id, by doing a view source on the HTML
-    $defaults = array( 'amount'   => 358,
-                'is_recur' => 1,
-                'frequency_interval' => 1,
-                'frequency_unit' => 'month',
-                'installments' => 12 );
-    $form->setDefaults( $defaults );
-
-    // also freeze these elements
-    $elementNames = array_keys( $defaults );
-    foreach ( $elementNames as $element ) {
-      $elm =& $form->getElement( $element );
-      $elm->freeze( );
-    }
-  }
-}
-
-function civitest_civicrm_caseSummary($caseID) {
-  /* Quick way to test what some results look like.
-     return array('some_unique_id' => array( 'label' => ts('Some Date'),
-     'value' => '2009-02-11',
-     ),
-     'some_other_id' => array( 'label' => ts('Some String'),
-     'value' => ts('Coconuts'),
-     ),
-     );
-  */
-
-  /*
-    For styling put this in css/extras.css:
-
-    #caseSummary {display: table;}
-    #modrtw {display: table-row; border: 1px solid #999999; width: 200px;}
-    #mcstat {display: table-row; border: 1px solid #999999; border-left: 0; width: 200px;}
-    #caseSummary label {display: table-cell;}
-    #caseSummary div {display: table-cell; padding-left: 5px; padding-right: 5px;}
-  */
-
-  // More realistic example, but will return nothing unless you have these activities in your database.
-  // TIP: Put these queries into methods in a custom class. You will likely want to re-use them elsewhere, such as in a CiviReport.
-
-  // This query finds the earliest date of return to modified duties in a workplace disability case.
-  $params = array( 1 => array( $caseID, 'Integer' ) );
-  $sql = "SELECT min(activity_date_time) as mindate
-FROM civicrm_activity a
-INNER JOIN civicrm_case_activity ca on a.id=ca.activity_id
-LEFT OUTER JOIN civicrm_option_group og on og.name='activity_type'
-LEFT OUTER JOIN civicrm_option_value ov on
-(og.id=ov.option_group_id AND ov.name='Return to modified duties')
-WHERE ca.case_id=%1
-AND ov.value=a.activity_type_id
-LIMIT 1";
-  $modrtw = CRM_Core_DAO::singleValueQuery( $sql, $params );
-
-  // This query returns the current status of the medical consent as determined by
-  // the presence or absence of related activities.
-  $sql = "SELECT CASE WHEN count(received.case_id) > 0 THEN 'Received'
-WHEN count(sent.case_id) > 0 AND DATEDIFF(CURRENT_TIMESTAMP, sent.activity_date_time) > 14 THEN 'Overdue'
-WHEN count(sent.case_id) > 0 THEN 'Sent'
-ELSE 'Not Sent'
-END
-FROM
-(SELECT ca.case_id, a1.activity_date_time FROM civicrm_activity a1
-INNER JOIN civicrm_case_activity ca on a1.id=ca.activity_id
-LEFT OUTER JOIN civicrm_option_group og on og.name='activity_type'
-LEFT OUTER JOIN civicrm_option_value ov on
-(og.id=ov.option_group_id AND ov.name='Send Consent Letter')
-WHERE ca.case_id=%1
-AND ov.value=a1.activity_type_id
-LIMIT 1
-) AS sent
-
-LEFT OUTER JOIN
-
-(SELECT ca2.case_id FROM civicrm_activity a2
-INNER JOIN civicrm_case_activity ca2 on a2.id=ca2.activity_id
-LEFT OUTER JOIN civicrm_option_group og2 on og2.name='activity_type'
-LEFT OUTER JOIN civicrm_option_value ov2 on
-(og2.id=ov2.option_group_id AND ov2.name='File Received Consent')
-WHERE ca2.case_id=%1
-AND ov2.value=a2.activity_type_id
-LIMIT 1
-) AS received
-ON received.case_id=sent.case_id";
-
-  $mcstat = CRM_Core_DAO::singleValueQuery( $sql, $params );
-
-  return array('modrtw' => array( 'label' => ts('Mod RTW:'),
-                         'value' => $modrtw,
-    ),
-    'mcstat' => array( 'label' => ts('Consent Status:'),
-              'value' => ts($mcstat),
-    ),
-  );
-}
-
-function civitest_civicrm_optionValues( &$values, $name ) {
-  if ( $name == 'activity_status' ) {
-    unset( $values[5] );
-  } else if ( $name == 'case_activity_type' ) {
-    unset( $values['standard_timeline'] );
-  }
-}
-
-/**
- * use the mail alter hook to inject raffle ticket numbers for participants
- * this is not complete, IMO and i'd also store the raffle ticket numbers in a
- * DB table to be on the safe side
- */
-function civitest_civicrm_alterMailParams( &$params ) {
-
-  if ( $params['groupName'] == 'msg_tpl_workflow_event' &&
-    $params['valueName'] == 'event_online_receipt' ) {
-
-    $smarty =  CRM_Core_Smarty::singleton( );
-    $values =& $smarty->get_template_vars( );
-    $vars = array( 'lineItem', 'participantID', 'contactID' );
-    foreach ( $vars as $varName ) {
-      $$varName = CRM_Utils_Array::value( $varName, $values, null );
-    }
-
-    // return if no lineitems in event registration
-    if ( ! $lineItem ||
-      ! is_array( $lineItem ) ) {
-      return;
-    }
-
-    // check for price field. the raffle id is 1 (in my test case)
-    define( 'RAFFLE_PRICE_FIELD_ID', 1 );
-    foreach ( $lineItem as $priceSet => $itemValues ) {
-      foreach ( $itemValues as $itemID => $itemValue ) {
-        if ( $itemValue['price_field_id'] != RAFFLE_PRICE_FIELD_ID ) {
-          continue;
-        }
-
-        $rafflePrefix = "{$contactID}_{$participantID}_";
-        $raffleString = array( );
-        $raffleCount  = 0;
-        switch ( $itemValue['label'] ) {
-          case 'One':
-            $raffleCount = 1;
-            break;
-
-          case 'Five':
-            $raffleCount = 5;
-            break;
-
-          case 'Ten':
-            $raffleCount = 10;
-            break;
-
-        }
-        for ( $i = 1 ; $i <= $raffleCount; $i++ ) {
-          $raffleString[] = $rafflePrefix . $i;
-        }
-        if ( ! empty( $raffleString ) ) {
-          $raffleString = implode( ', ', $raffleString );
-          $params['text'] .= "
-
-===========================================================
-Event Raffle Ticket Numbers
-===========================================================
-
-Thank you for buying raffle tickets.  Your ticket numbers are:$raffleString. Good luck!
-
-";
-          $htmlSnippet = "
-<center>
- <table width=\"620\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left;\">
-
-  <tr>
-   <td>
-    <table style=\"border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;\">
-     <tr>
-      <th colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\">
-       Event Raffle Ticket Numbers      </th>
-     </tr>
-     <tr>
-      <td colspan=\"2\" style=\"padding: 4px; border-bottom: 1px solid #999;\">
-       Thank you for buying raffle tickets.  Your ticket numbers are:$raffleString. Good luck!
-      </td>
-     </tr>
-    </table>
-   </td>
-  </tr>
- </table>
-</center>
-
-</body>
-";
-
-          $params['html'] = str_replace( "</body>",
-                            $htmlSnippet,
-                            $params['html'] );
-        }
-      }
-    }
-  }
-}
-
-function civitest_civicrm_navigationMenu( &$params ) {
-
-  //  Get the maximum key of $params
-  $maxKey = ( max( array_keys($params) ) );
-
-  $params[$maxKey+1] = array (
-    'attributes' => array (
-      'label'      => 'Custom Menu Entry',
-      'name'       => 'Custom Menu Entry',
-      'url'        => null,
-      'permission' => null,
-      'operator'   => null,
-      'separator'  => null,
-      'parentID'   => null,
-      'navID'      => $maxKey+1,
-      'active'     => 1
-    ),
-    'child' =>  array (
-      '1' => array (
-        'attributes' => array (
-          'label'      => 'Custom Child Menu',
-          'name'       => 'Custom Child Menu',
-          'url'        => 'http://www.testlink.com',
-          'permission' => 'access CiviContribute
-',
-          'operator'   => null,
-          'separator'  => 1,
-          'parentID'   => $maxKey+1,
-          'navID'      => 1,
-          'active'     => 1
-        ),
-        'child' => null
-      ) ) );
-}
-
-/**
- * This hook allows modification of the data used to perform merging of duplicates.
- * @param string $type the type of data being passed (cidRefs|eidRefs|relTables|sqls)
- * @param array $data  the data, which depends on the value of $type:
- *      'relTables':
- *          an array of tables used for asking user which elements to merge,
- *          as used at civicrm/contact/merge; each table in the array has this format:
- *                'rel_table_UNIQUE-TABLE-NICKNAME' => array(
- *                    'title'  => ts('TITLE'),
- *                    'tables' => array('TABLE-NAME' [, ...]),
- *                    'url'    => CRM_Utils_System::url(PATH, QUERY),
- *                )
- *      'sqls':
- *          a one-dimensional array of SQL statements to be run in the final merge operation;
- *          These SQL statements are run within a single transaction.
- *      'cidRefs':
- *          an array of tables and their fields referencing civicrm_contact.contact_id explicitely;
- *          each table in the array has this format:
- *                'TABLE-NAME' => array('COLUMN-NAME' [, ...])
- *      'eidRefs':
- *          an array of tables and their fields referencing civicrm_contact.contact_id with entity_id;
- *          each table in the array has this format:
- *                'TABLE-NAME' => array('entity_table-COLUMN-NAME' => 'entity_id-COLUMN-NAME')
- *      'batch':
- *          an array of migration info that will be transfered from other-contact to main-contact during a
- *          batch merge process. fields_in_conflict could be modified / resolved here.
- * @param int $mainId  contact_id of the contact that survives the merge (only when $type == 'sqls')
- * @param int $otherId contact_id of the contact that will be absorbed and deleted (only when $type == 'sqls')
- * @param array $tables when $type is "sqls", an array of tables as it may have been handed to the calling function
- *
- * @access public
- */
-
-function civitest_civicrm_merge ( $type, &$data, $mainId = NULL, $otherId = NULL, $tables = NULL ) {
-
-  switch ($type) {
-    case 'relTables':
-      // Allow user to decide whether or not to merge records in `civitest_foo` table
-      $data['rel_table_foo'] = array(
-        'title'  => ts('Foos'),                 // Title as shown to user for this type of data
-        'tables' => array('civitest_foo'),      // Name of database table holding these records
-        'url'    => CRM_Utils_System::url('civicrm/civitest/foo', 'action=browse&cid=$cid'),
-        // URL to view this data for this contact,
-        // in this case using CiviCRM's native URL utility
-        // NOTE: '$cid' will be replaced with correct
-        // CiviCRM contact ID.
-      );
-      break;
-
-    case 'cidRefs':
-      // Add references to civitest_foo.contact_id, and civitest_foo.foo_id, both of which
-      // are foreign keys to civicrm_contact.id.  By adding this to $data, records in this
-      // table will be automatically included in the merge.
-      $data['civitest_foo'] = array('contact_id', 'foo_id');
-      break;
-
-    case 'eidRefs':
-      // Add references to civitest_bar table, which is keyed to civicrm_contact.id
-      // using `bar_entity_id` column, when `entity_table` is equal to 'civicrm_contact'. By
-      // adding this to $data, records in this table will be automatically included in
-      // the merge.
-      $data['civitest_bar'] = array('entity_table' => 'bar_entity_id');
-      break;
-
-    case 'sqls':
-      // Note that this hook can be called twice with $type = 'sqls': once with $tables
-      // and once without. In our case, SQL statements related to table `civicrm_foo`
-      // will be listed in $data when $tables is set; SQL statements related to table
-      // `civicrm_bar` will be listed in $data when $tables is NOT set.  The deciding
-      // factor here is that `civicrm_foo` was referenced above as part of the 'relTables'
-      // data, whereas `civicrm_bar` was not.
-      if ($tables) {
-        // Nothing to do in our case. In some cases, you might want to find and
-        // modify existing SQL statements in $data.
-      } else {
-        // Nothing to do in our case. In some cases, you might want to find and
-        // modify existing SQL statements in $data.
-      }
-      break;
-
-    case 'batch':
-      // $data is an array of migration info that will be transfered from other-contact to main-contact during a
-      // batch merge process. fields_in_conflict could be modified / resolved here.
-      // $data['fields_in_conflict'] could be looked into and filled with proper values which will help
-      // resolve conflict & allow batch merge process to run without any problems / conflicts.
-      break;
-
-    case 'flip':
-      // implement complex biasing decisions on which contact to keep or merge into.
-      // In example below we bias to contact with max contributions
-      $doSwap = FALSE;
-      $query  = "SELECT count(*) FROM civicrm_contribution WHERE contact_id = %1";
-      $SrcCount = CRM_Core_DAO::singleValueQuery($query, array(1 => array($data['srcID'], 'Integer')));
-      $dstCount = CRM_Core_DAO::singleValueQuery($query, array(1 => array($data['dstID'], 'Integer')));
-      if ($SrcCount > $dstCount) {
-        // keep contact with max contributions as destination (contact to be retained)
-        $doSwap = TRUE;
-      }
-      // we 'll add some more logic here to decide biasing
-
-      if ($doSwap) {
-        $tempID = $data['srcID'];
-        $data['srcID'] = $data['dstID'];
-        $data['dstID'] = $tempID;
-      }
-      $data['auto_flip'] = FALSE;
-      break;
-
-  }
-}
-
-/**
- * This hook provides a way to override the default privacy behavior for notes.
- * $node['privacy'] is an integer, by default either 0 meaning no privacy, or 1
- * meaning the note is displayed to author only.
- * @param array $note (reference) Associative array of values for this note
- */
-function civitest_civicrm_notePrivacy (&$note) {
-
-  /* CiviCRM will check for existence of $note['notePrivacy_hidden'].
-   *
-   * If this value is not set, CiviCRM will show or display the note
-   * based on the default, which is to count a note as private if it has
-   * any non-zero value in $note['privacy'], and then to display private
-   * notes only to the note author.
-   *
-   * If this value is set, CiviCRM will hide the note if the value is
-   * TRUE, and display the note if the value is FALSE.
-   */
-
-  if ($note['privacy']) {
-    if ($my_business_rules_say_so) {
-      $note['notePrivacy_hidden'] = TRUE;
-    } else {
-      $note['notePrivacy_hidden'] = FALSE;
-    }
-  }
-}
-
-/* a ready to use module is available at  http://github.com/tttp/civi_export */
-function civitest_civicrm_export( $exportTempTable, $headerRows, $sqlColumns, $exportMode ) {
-  $writeHeader = true;
-  $offset = 0;
-  $limit  = 200;
-
-  $query = "
-SELECT *
-FROM   $exportTempTable
-";
-  require_once 'CRM/Core/Report/Excel.php';
-  while ( 1 ) {
-    $limitQuery = $query . "
-LIMIT $offset, $limit
-";
-    $dao = CRM_Core_DAO::executeQuery( $limitQuery );
-
-    if ( $dao->N <= 0 ) {
-      break;
-    }
-
-    $componentDetails = array( );
-    while ( $dao->fetch( ) ) {
-      $row = array( );
-
-      foreach ( $sqlColumns as $column => $dontCare ) {
-        $row[$column] = $dao->$column;
-      }
-
-      $componentDetails[] = $row;
-    }
-    CRM_Core_Report_Excel::writeHTMLFile( "Export_Records", $headerRows,
-      $componentDetails, null, $writeHeader );
-    $writeHeader = false;
-    $offset += $limit;
-  }
-
-  CRM_Utils_System::civiExit( );
-}
-
-
-/*
- * import hook allows you to interact with the import data post process
- * this example retrieves a special column (tag_import) with pipe-separated tags and
- * create/tags the imported contact record to a predefined tagset (id=296)
- */
-
-function civitest_civicrm_import( $object, $usage, &$objectRef, $params ) {
-
-  if ( $object != 'Contact' &&
-    $usage  != 'process' ) {
-    return;
-  }
-
-  //during import, accept special tag_import column for processing
-  $cType           = $objectRef->_contactType;
-  $dupeType        = $objectRef->_onDuplicate;
-  $contactID       = $params['contactID'];
-  $importID        = $params['importID'];
-  $importTempTable = $params['importTempTable'];
-  $fields          = $params['fields'];
-
-  require_once 'CRM/Core/DAO.php';
-  $sqlTags = "SELECT tag_import
-        FROM $importTempTable
-        WHERE _id = $importID;";
-  $taglist = CRM_Core_DAO::singleValueQuery( $sqlTags );
-
-  if ( $taglist ) {
-
-    require_once 'api/api.php';
-    require_once 'CRM/Core/BAO/EntityTag.php';
-
-    $keywords = array();
-    $keywords = explode( '|', $taglist );
-
-    foreach ( $keywords as $keyword ) {
-      $params = array( 'name' => $keyword, 'parent_id' => '296', 'version' => 3 ); //import tags to tagset with id 296
-
-      //lookup tag; create new if nonexist
-      $tag = civicrm_api( 'Tag', 'get', $params );
-      if ( civicrm_error( $tag ) ) {
-        $tag = civicrm_api( 'Tag', 'create', $params );
-        $tagid = $tag['id'];
-      } else {
-        $tagid = $tag['id'];
-      }
-
-      //only add tag to contact if not already present
-      $entityTags = CRM_Core_BAO_EntityTag::getTag($contactID);
-      if ( !in_array($tagid, $entityTags) ) {
-        $entityParams = array( 'tag_id' => $tagid, 'contact_id' => $contactID, 'version' => 3 );
-        $entityTag = civicrm_api( 'EntityTag', 'create', $entityParams );
-      }
-    }
-  }
-}
-
-/**
- *  alterAPIPermissions() hook allows you to change the permissions checked when doing API 3 calls.
- */
-function civitest_civicrm_alterAPIPermissions($entity, $action, &$params, &$permissions)
-{
-  // skip permission checks for contact/create calls
-  // (but keep the ones for email, address, etc./create calls)
-  // note: unsetting the below would require the default ‘access CiviCRM’ permission
-  $permissions['contact']['create'] = array();
-
-  // enforce ‘view all contacts’ check for contact/get, but do not test ‘access CiviCRM’
-  $permissions['contact']['get'] = array('view all contacts');
-
-  // add a new permission requirement for your own custom API call
-  // (if all you want to enforce is ‘access CiviCRM’ you can skip the below altogether)
-  $permissions['foo']['get'] = array('access CiviCRM', 'get all foos');
-
-  // allow everyone to get info for a given event; also – another way to skip permissions
-  if ($entity == 'event' and $action == 'get' and $params['title'] == 'CiviCon 2038') {
-    $params['check_permissions'] = false;
-  }
-}
-
-/**
- *This hook allows User to customize the actions on contact summary page .
- *where contribution,note,and rel are some key to action in $actions array.
- */
-
-function civitest_civicrm_summaryActions( &$actions, $contactID = NULL ) {
-  $customizeActions = array('contribution', 'note', 'rel');
-  foreach( $actions as $key => $value ) {
-    if ( in_array( $key, $customizeActions ) ) {
-      unset( $actions[$key] );
-    }
-  }
-}
-
-function civitest_civicrm_searchColumns( $objectName, &$headers,  &$values, &$selector ) {
-
-  if ( $objectName == 'Contact' ) {
-    // Lets move a few header around, and overwrite stuff we dont need
-
-    // move email to postal slot
-    $headers[5] = $headers[7];
-
-    // move phone to country slot
-    $headers[6] = $headers[8];
-
-    // lets change the title of the last two columns to fields we need
-    $headers[7]['name'] = 'Source';
-    unset( $headers[7]['sort'] );
-
-    $headers[8]['name'] = 'Job Title';
-    unset( $headers[8]['sort'] );
-
-    foreach ( $values as $id => $value ) {
-      $result = civicrm_api( 'Contact', 'GetSingle',
-                array( 'version' => 3,
-                  'id' => $value['contact_id'],
-                  'return.contact_source' => 1,
-                  'return.job_title' => 1 ) );
-
-      // store this value so it gets passed to the template
-      $values[$id]['source'] = $result['contact_source'];
-      $values[$id]['job_title'] = $result['job_title'];
-    }
-
-    // remember to modify CRM/Contact/Form/Selector.tpl to see the changes
-  }
-
-  if ( $objectName == 'Contribute' ) {
-    // rename type to total amount
-    foreach ( $headers as $id => $header ) {
-      if ( $header['name'] == 'Type' ) {
-        $headers[$id]['name'] = 'Total';
-        unset( $headers[$id]['sort'] );
-      }
-    }
-
-    foreach ( $values as $id => $value ) {
-      $sql = "
-                                                                                                              SELECT SUM(total_amount)
-                                                                                                              FROM   civicrm_contribution
-                                                                                                              WHERE  contact_id = %1
-                                                                                                              ";
-      $values[$id]['total'] = CRM_Core_DAO::singleValueQuery( $sql,
-                              array( 1 => array( $value['contact_id'],
-                                        'Integer' ) ) );
-      // this is cheating, but allows us NOT to modify the template
-      // override the values that we are not using
-      $values[$id]['financial_type'] = $values[$id]['total'];
-    }
-  }
-
-}
-
-/*
- * Implements hook_civicrm_buildStateProvinceForCountry().
- *
- * Reorder the dublin states so that Dublin is at the top and dublin sub
- * states are ordered nicely.
- */
-function civitest_civicrm_buildStateProvinceForCountry( $countryID, &$states ) {
-  // First separate out the Dublin options.
-  $topStates = array();
-  foreach ($states as $key => $value) {
-    if (preg_match('/Dublin/', $value)) {
-      $topStates[$key] = $value;
-    } else {
-      $otherStates[$key] = $value;
-    }
-  }
-  ksort($topStates);
-  $states = $topStates + $otherStates;
-}
-
-function civitest_civicrm_dupeQuery( $obj, $type, &$data ) {
-  //don't run these during user account/contact creation
-  if( $obj->noRules || $type != 'table')
-    return;
-
-  if ( $obj->name=='My Dedupe Rule Group Name' ) {
-    //first unset existing queries
-    $data = array();
-
-    //now set threshold to match our revised rule
-    $obj->threshold = 5;
-
-    if ( empty($obj->params) ) {
-      //set new query when doing an internal dedupe (finding duplicate contacts)
-      $data['civicrm_contact.last_name.5'] = "
-SELECT t1.id id1, t2.id id2, 5 weight
-FROM   civicrm_contact t1
-INNER JOIN civicrm_contact t2 ON ( t1.first_name = t2.first_name AND
-                                   t1.last_name = t2.last_name AND
-                                 IFNULL(t1.middle_name,0) = IFNULL(t2.middle_name,0) AND
-                                 IFNULL(t1.suffix_id,0) = IFNULL(t2.suffix_id,0) )
-INNER JOIN civicrm_address a1 on t1.id=a1.contact_id
-INNER JOIN civicrm_address a2 on t2.id=a2.contact_id AND
-                                 a1.postal_code = a2.postal_code AND
-                                 a1.street_address = a2.street_address
-WHERE t1.contact_type = 'Individual'
-  AND t2.contact_type = 'Individual'
-  AND t1.id < t2.id
-  AND t1.last_name IS NOT NULL
-  AND t1.first_name IS NOT NULL
-  AND a1.postal_code IS NOT NULL
-  AND a1.street_address IS NOT NULL
-";
-    }
-  }
-
-  // ============= ANOTHER USE CASE =========
-  if ($type == 'supportedFields' && !empty($data)) {
-    // This makes a new custom rule appear in UI
-    $data['Individual']['civicrm_contact']['custom_initial_last_email']    = "Custom: Initial AND Last Name AND Email";
-  }
-
-  if ($type == 'dedupeIndexes' && !empty($data)) {
-    // since we don't want any index to be created for our new custom rule:
-    foreach ($data['civicrm_contact'] as $key => $val) {
-      if (in_array($val, array('custom_initial_last_email'))) {
-        unset($data['civicrm_contact'][$key]);
-      }
-    }
-  }
-
-  // This is how one could add the custom rule query:
-  if ($type == 'table' && !empty($data)) {
-    foreach ($data as $key => &$query) {
-      list($table, $col, $wt) = explode('.', $key);
-      if ($table == 'civicrm_contact' && $col == 'custom_initial_last_email') {
-        $data[$key] = "
-          SELECT t1.id id1, t2.id id2, $wt weight
-          FROM civicrm_contact t1
-          INNER JOIN civicrm_email em1 ON t1.id = em1.contact_id
-          JOIN ( SELECT cc.id, cc.first_name, cc.last_name, cc.contact_type, em2.email
-              FROM civicrm_contact cc
-              INNER JOIN civicrm_email em2 ON cc.id = em2.contact_id ) t2 ON SUBSTR(t1.first_name, 1, 1) = SUBSTR(t2.first_name, 1, 1) AND
-          t1.last_name = t2.last_name AND
-          em1.email = t2.email
-          WHERE t1.contact_type = 'Individual' AND
-          t2.contact_type = 'Individual' AND
-          t1.id < t2.id AND
-          t1.first_name IS NOT NULL AND
-          t1.last_name  IS NOT NULL AND
-          em1.email IS NOT NULL";
-      }
-    }
-  }
-
-}
-
-/**
- * Hook implementations to get the display name of the
- * shared address field
- *
- */
-
-/*
- * Define the hook name
- */
-function civitest_civicrm_tokens( &$tokens ) {
-  $tokens['sharedAddress'] = array( 'sharedAddress.orgName' => 'Shared Address Name' );
-}
-
-
-/*
- * Retrieve the values for the org names if this contact ID is linked
- * to another address via the shared addres scheme (which uses a pointer in
- * the civicrm_address table: master_id to point to the real address
- */
-function civitest_civicrm_tokenValues( &$values, &$contactIDs ) {
-  if ( is_array( $contactIDs ) ) {
-    $contactIDString = ' ( ' . implode( ',', array_values( $contactIDs ) ) . ' ) ';
-    $single = false;
-  } else {
-    $contactIDString = "( $contactIDs )";
-    $single = true;
-  }
-
-  $query = "
-SELECT     slave.id as contact_id, master.display_name as org_name
-FROM       civicrm_contact master
-INNER JOIN civicrm_address addressMaster ON addressMaster.contact_id = master.id
-INNER JOIN civicrm_address addressSlave ON addressSlave.master_id = addressMaster.id
-INNER JOIN civicrm_contact slave  ON addressSlave.contact_id = slave.id
-WHERE      slave.id IN $contactIDString
-";
-
-  $dao = CRM_Core_DAO::executeQuery( $query );
-  while ( $dao->fetch( ) ) {
-    if ( empty( $dao->org_name ) ) {
-      continue;
-    }
-
-    if ( $single ) {
-      $value =& $values;
-    } else {
-      if ( ! array_key_exists( $dao->contact_id, $values ) ) {
-        $values[$dao->contact_id] = array( );
-      }
-      $value =& $values[$dao->contact_id];
-    }
-
-    $value['sharedAddress.orgName'] = $dao->org_name;
-  }
-}
-
-
-function civitest_civicrm_emailProcessorContact( $email, $contactID, &$result ) {
-  require_once 'CRM/Utils/Mail/Incoming.php';
-
-  // first split the email into name and domain
-  // really simple, definitely wrong implementation
-  list( $mailName, $mailDomain ) = CRM_Utils_System::explode( '@', $email, 2 );
-
-  // we are doing all our checks based on mailDomain, so if empty
-  // return and let EmailProcessor do its own thing
-  if ( empty( $mailDomain ) ) {
-    return;
-  }
-
-  define( 'FILE_TO_ORG_ALWAYS_TAG', 'MyTag1' );
-  $orgID = _civitest_find_org_with_tag( FILE_TO_ORG_ALWAYS_TAG, $mailDomain );
-  if ( $orgID ) {
-    $result = array( 'contactID' => $orgID,
-              'action'    => CRM_Utils_Mail_Incoming::EMAILPROCESSOR_OVERRIDE );
-    return;
-  }
-
-  // if we already have a match, we will
-  // return and let EmailProcessor do its own thing
-  if ( $contactID ) {
-    return;
-  }
-
-  // Orgs with this tag will have same-domain emails filed on them only if it
-  // passes through the ALWAYS tag check without finding a match, AND it does
-  // not match an individual.
-  define( 'FILE_TO_ORG_INDIVIDUAL_UNMATCHED_TAG', 'MyTag2' );
-  $orgID = _civitest_find_org_with_tag( FILE_TO_ORG_INDIVIDUAL_UNMATCHED_TAG, $mailDomain );
-  if ( $orgID ) {
-    $result = array( 'contactID' => $orgID,
-              'action'    => CRM_Utils_Mail_Incoming::EMAILPROCESSOR_OVERRIDE );
-    return;
-  }
-
-  $result = array( 'action'    => CRM_Utils_Mail_Incoming::EMAILPROCESSOR_CREATE_INDIVIDUAL );
-
-  return;
-}
-
-function _civitest_find_org_with_tag( $tagName, $emailDomain ) {
-  $sql = "
-SELECT     o.id
-FROM       civicrm_contact o
-INNER JOIN civicrm_entity_tag et ON ( et.entity_table = 'civicrm_contact' AND et.entity_id = o.id )
-INNER JOIN civicrm_tag         t ON ( et.tag_id = t.id )
-INNER JOIN civicrm_email       e ON ( e.contact_id = o.id )
-WHERE      t.name = %1
-AND        e.email LIKE %2
-";
-
-  $params = array( 1 => array( $tagName         , 'String' ),
-            2 => array( "%{$emailDomain}", 'String' ) );
-  return CRM_Core_DAO::singleValueQuery( $sql, $params );
-}
-
-/**
- * From the forum topic: http://forum.civicrm.org/index.php/topic,22430.0.html
- * This has come up a few times and i felt compelled to investigate and scratch the itch.
- * Here is a sample implementation of the ACL hook that suppresses profiles in the my account page
- * Note that none of the roles involved can have the global profile view or edit permssion
- * since those permissions trump the ACL. Also for sanity sake, these profiles
- * should probably be restricted only to the My Account scenario:
- */
-function civitest_civicrm_aclGroup( $type, $contactID, $tableName, &$allGroups, &$currentGroups ) {
-  if ( $tableName != 'civicrm_uf_group' ) {
-    return;
-  }
-
-  global $user;
-  $userRoles = $user->roles;
-
-  // based on the above value, choose which profile
-  // to retain for this user
-  // role name => profile name
-  $allProfiles = array( 'member'    => 'Member Profile',
-                 'supporter' => 'Supporter Profile',
-                 'major'     => 'Major Donor Profile',
-                 'real big'  => 'Real Big Donor Profile'
-  );
-
-  // first find the ids of all the profiles
-  $profileIDs = array( );
-  foreach ( $allProfiles as $roleName => $profileName ) {
-    $profileIDs[$profileName] = array_search( $profileName, $allGroups );
-  }
-
-  foreach ( $allProfiles as $roleName => $profileName ) {
-    if ( array_search( $roleName, $userRoles ) !== false ) {
-      unset( $profileIDs[$profileName] );
-    }
-  }
-
-  $currentGroups = array_diff( array_keys  ( $allGroups ),
-                   array_values( $profileIDs ) );
-}
-
-/**
- * An optimized version to speed up the contact autocomplete for large DB's
- * does not obey the settings from the UI. Does name check followed by email
- * if needed. Adds email + city to output if they exist
- */
-function civitest_civicrm_contactListQuery( &$query, $name, $context, $id ) {
-  // if other params are passed, the return without any changes
-  if ( $_GET['context'] != 'navigation' ) {
-    return;
-  }
-
-  // we are ignoring limit currently
-  //create temp table for storing result set
-  $randomNum = md5( uniqid( ) );
-  $quickSearchTempTable = "civicrm_temp_quick_search_{$randomNum}";
-  $sql = "CREATE TEMPORARY TABLE {$quickSearchTempTable} (
-            contact_id int unsigned,
-            data varchar(255),
-            PRIMARY KEY ( contact_id )
-        ) ENGINE=HEAP DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci
-        ";
-
-  CRM_Core_DAO::executeQuery( $sql );
-
-  // find the match from contact table
-  $sql = "
-        SELECT id, sort_name
-        FROM civicrm_contact
-        WHERE sort_name LIKE '$name%'
-        AND is_deleted = 0
-        ORDER BY sort_name LIMIT 0, 10";
-
-  $dao = CRM_Core_DAO::executeQuery( $sql );
-  $result = array();
-  while ( $dao->fetch() ) {
-    $result[$dao->id] = $dao->sort_name;
-  }
-
-  // if matches found less than 10, try to match from email table
-  if ( $dao->N < 10 ) {
-    // find the match from email table
-    $sql = "
-            SELECT contact_id, email
-            FROM civicrm_email
-            WHERE email LIKE '$name%'
-            ORDER BY email LIMIT 0, 10";
-
-    $dao = CRM_Core_DAO::executeQuery( $sql );
-    while ( $dao->fetch() ) {
-      if ( !array_key_exists( $dao->contact_id, $result ) ) {
-        $result[$dao->contact_id] = $dao->email;
-      }
-    }
-  }
-
-  // find email addresses, cities for these contacts
-  $ids = array();
-  foreach($result as $id => $value) { $ids[] = $id; }
-  $ids = implode(", ", $ids);
-  $sql = "
-        SELECT civicrm_contact.id, civicrm_email.email, civicrm_address.city
-        FROM civicrm_contact, civicrm_email, civicrm_address
-        WHERE civicrm_contact.id = civicrm_email.contact_id
-        AND civicrm_contact.id = civicrm_address.contact_id
-        AND civicrm_email.is_primary = 1
-        AND civicrm_address.is_primary = 1
-        AND civicrm_contact.id IN ( $ids )";
-  $dao = CRM_Core_DAO::executeQuery( $sql );
-  while($dao->fetch()) {
-    $result[$dao->id] .= " :: ".$dao->email." :: ".$dao->city;
-  }
-
-  // insert into temp table
-  if ( !empty( $result ) ) {
-    foreach( $result as $cid => $value ) {
-      $value = addslashes($value);
-      $insertSQL[] = "( {$cid}, '{$value}' )";
-    }
-    $insertValues = implode( ',', $insertSQL );
-    $sql = "INSERT INTO {$quickSearchTempTable}
-                (contact_id, data )
-                VALUES
-                {$insertValues}
-                ";
-    CRM_Core_DAO::executeQuery( $sql );
-  }
-
-  // return final query
-  $query = "SELECT data, contact_id as id
-        FROM {$quickSearchTempTable}";
-
-}
-
-function civitest_civicrm_alterContent( &$content,
-  $context,
-  $tplName,
-  &$object ) {
-  // u can modify the content programmatically
-  // similar to as described in this blog post
-  // http://civicrm.org/blogs/dave-greenberg/now-its-easier-add-custom-behaviors-templates
-}
-
-// this example has been contributed by graylin kim from NYSS
-function civitest_civicrm_triggerInfo(&$triggers, $tableName=NULL) {
-  $triggers[] = array(
-    'table' => 'civicrm_contact',
-    'event' => array('update', 'insert'),
-    'when'  => 'after',
-    'variables' => "
-            DECLARE norm_first_name VARCHAR(255);
-            DECLARE norm_middle_name VARCHAR(255);
-            DECLARE norm_last_name VARCHAR(255);
-            DECLARE norm_household_name VARCHAR(255);
-            DECLARE norm_organization_name VARCHAR(255);",
-    'sql' => "
-            SET norm_first_name = BB_NORMALIZE(NEW.first_name);
-            SET norm_middle_name = BB_NORMALIZE(NEW.middle_name);
-            SET norm_last_name = BB_NORMALIZE(NEW.last_name);
-            SET norm_household_name = BB_NORMALIZE(NEW.household_name);
-            SET norm_organization_name = BB_NORMALIZE(NEW.organization_name);
-
-            INSERT INTO shadow_contact
-            (contact_id, first_name, middle_name, last_name, suffix_id, birth_date, gender_id, contact_type, household_name, organization_name)
-            VALUES (NEW.id, norm_first_name, norm_middle_name, norm_last_name, NEW.suffix_id, NEW.birth_date, NEW.gender_id, NEW.contact_type, norm_household_name, norm_organization_name)
-            ON DUPLICATE KEY UPDATE
-            first_name=norm_first_name,
-            middle_name=norm_middle_name,
-            last_name=norm_last_name,
-            suffix_id=NEW.suffix_id,
-            birth_date=NEW.birth_date,
-            gender_id=NEW.gender_id,
-            contact_type=NEW.contact_type,
-            household_name=norm_household_name,
-            organization_name=norm_organization_name;"
-  );
-
-  $triggers[] = array(
-    'table' => 'civicrm_address',
-    'event' => array('update','insert'),
-    'when'  => 'after',
-    'variables' => "
-            DECLARE norm_supplemental_address_1 VARCHAR(255);
-            DECLARE norm_supplemental_address_2 VARCHAR(255);
-            DECLARE norm_street_address VARCHAR(255);
-            DECLARE norm_postal_code VARCHAR(255);
-            DECLARE norm_city VARCHAR(255);",
-    'sql' => "
-            SET norm_supplemental_address_1 = BB_NORMALIZE_ADDR(NEW.supplemental_address_1);
-            SET norm_supplemental_address_2 = BB_NORMALIZE_ADDR(NEW.supplemental_address_2);
-            SET norm_street_address = BB_NORMALIZE_ADDR(NEW.street_address);
-            SET norm_postal_code = IFNULL(NEW.postal_code,'');
-            SET norm_city = IFNULL(NEW.city,'');
-
-            INSERT INTO shadow_address
-                        (address_id, contact_id, street_address, postal_code, city, country_id, state_province_id, supplemental_address_1, supplemental_address_2)
-                 VALUES (NEW.id, NEW.contact_id, norm_street_address, norm_postal_code, norm_city, NEW.country_id, NEW.state_province_id, norm_supplemental_address_1, norm_supplemental_address_2)
-                 ON DUPLICATE KEY UPDATE
-                        street_address=norm_street_address,
-                        postal_code=norm_postal_code,
-                        city=norm_city,
-                        country_id=NEW.country_id,
-                        state_province_id=NEW.state_province_id,
-                        supplemental_address_1=norm_supplemental_address_1,
-                        supplemental_address_2=norm_supplemental_address_2;"
-  );
-
-  $triggers[] = array(
-    'table' => 'civicrm_contact',
-    'event' => 'delete',
-    'when'  => 'after',
-    'sql'   => 'DELETE FROM shadow_contact WHERE contact_id=OLD.id;'
-  );
-
-  $triggers[] = array(
-    'table' => 'civicrm_address',
-    'event' => 'delete',
-    'when'  => 'after',
-    'sql'   => 'DELETE FROM shadow_address WHERE address_id=OLD.id;'
-  );
-}
-
-function civitest_civicrm_alterReportVar($varType, &$var, &$form) {
-  $formName = get_class($form);
-  if ( $formName == 'CRM_Report_Form_Campaign_SurveyDetails' ) {
-    if ( $varType == 'columns' ) {
-      $var['civicrm_contribution'] =
-        array(
-          'dao' => 'CRM_Contribute_DAO_Contribution',
-          'fields' =>
-          array(
-            'receive_date' =>
-            array('title' => ts('last contribution date'),
-            ),
-            'total_amount' =>
-            array('title' => ts('last contri Amount'),
-            ),
-          ),
-          'grouping' => 'survey-activity-fields',
-        );
-    } else if ( $varType == 'sql' ) {
-      $params = $form->getVar( '_params' );
-      if ( CRM_Utils_Array::value('receive_date', $params['fields']) || CRM_Utils_Array::value('total_amount', $params['fields']) ) {
-        $var->_from .= "LEFT JOIN civicrm_contribution {$form->_aliases['civicrm_contribution']} ON ({$form->_aliases['civicrm_contribution']}.id = (select id from civicrm_contribution con where con.contact_id = {$form->_aliases['civicrm_contact']}.id ORDER BY con.receive_date DESC LIMIT 1 ))\n";
-      }
-    }
-  }
-}
-
-function civitest_civicrm_alterBarcode(&$data, $type, $context ) {
-  if ($type == 'barcode' && $context == 'name_badge') {
-    // change the encoding of barcode
-    $data['current_value'] = $data['event_id'] . '-' . $data['participant_id'] . '-' . $data['contact_id'];
-  }
-}
-
-function civitest_civicrm_unsubscribeGroups( $op, $mailingId, $contactId, &$groups, &$baseGroups ) {
-  // do the below for even mailing ids only
-  // in a real implementation, you will have some logic to restrict what mailings
-  // you want to handle the unsub via a different patch
-  // this hook basically redirects you to a custom unsubscribe page
-  // thanx to parvez @ veda consulting for this example
-  if ($op == 'unsubscribe' && $mailingId % 2 == 0) {
-    $oConfig                 = CRM_Core_Config::singleton();
-    $sUnsubscribeRedirectUrl = $oConfig->unsubscribe_redirect_url;
-    if ( !empty( $sUnsubscribeRedirectUrl ) ) {
-      CRM_Utils_System::redirect( $sUnsubscribeRedirectUrl );
-    } else {
-      CRM_Core_Error::statusBounce( 'Unsubscribe URL has not been set.' );
-    }
-    CRM_Utils_System::civiExit();
-  }
-}
-
-function civitest_civicrm_tabset($tabsetName, &$tabs, $context) {
-  //check if the tab set is Event manage
-  if ($tabsetName == 'civicrm/event/manage') {
-    if (!empty($context)) {
-      $eventID = $context['event_id'];
-      $url = CRM_Utils_System::url( 'civicrm/event/manage/volunteer',
-        "reset=1&snippet=5&force=1&id=$eventID&action=update&component=event" );
-    //add a new Volunteer tab along with url
-     $tab['volunteer'] = array(
-        'title' => ts('Volunteers'),
-        'link' => $url,
-        'valid' => 1,
-        'active' => 1,
-        'current' => false,
-      );
-    }
-    else {
-      $tab['volunteer'] = array(
-      'title' => ts('Volunteers'),
-        'url' => 'civicrm/event/manage/volunteer',
-      );
-    }
-
-  //Insert this tab into position 4
-
-  $tabs = array_merge(
-      array_slice($tabs, 0, 4),
-      $tab,
-      array_slice($tabs, 4)
-    );
-  }
-}
-
-function civitest_civicrm_dashboard_defaults($availableDashlets, &$defaultDashlets){
-  $contactID = CRM_Core_Session::singleton()->get('userID');
-  $defaultDashlets[] = array(
-    'dashboard_id' => 3,
-    'is_active' => 1,
-    'column_no' => 1,
-    'contact_id' => $contactID,
-  );
-}

From 0ea42d0dc55fd7f1cf476bcde6cb4b893970a621 Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Tue, 19 Sep 2017 20:26:51 +1000
Subject: [PATCH 31/86] Run Civilint against civicrm_engage module

---
 .../Engage/Report/Form/CallList.php           | 134 +++++-------
 .../Engage/Report/Form/List.php               | 126 ++++++-----
 .../Engage/Report/Form/WalkList.php           | 204 ++++++++----------
 .../civicrm_engage/civicrm_engage.admin.inc   | 102 +++++----
 modules/civicrm_engage/civicrm_engage.install |  15 +-
 modules/civicrm_engage/civicrm_engage.module  |  77 ++++---
 6 files changed, 308 insertions(+), 350 deletions(-)

diff --git a/modules/civicrm_engage/Engage/Report/Form/CallList.php b/modules/civicrm_engage/Engage/Report/Form/CallList.php
index dd56c84..3446120 100644
--- a/modules/civicrm_engage/Engage/Report/Form/CallList.php
+++ b/modules/civicrm_engage/Engage/Report/Form/CallList.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        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  *
@@ -40,111 +40,102 @@
  *  Generate a phone call list report
  */
 class Engage_Report_Form_CallList extends Engage_Report_Form_List {
-  function __construct() {
+  public function __construct() {
 
     parent::__construct();
 
     $this->_columns = array(
-      'civicrm_phone' =>
-      array(
+      'civicrm_phone' => array(
         'dao' => 'CRM_Core_DAO_Phone',
-        'fields' =>
-        array(
-          'phone' => array('default' => TRUE,
+        'fields' => array(
+          'phone' => array(
+            'default' => TRUE,
             'required' => TRUE,
-          )),
+          ),
+        ),
         'grouping' => 'location-fields',
-        'order_bys' =>
-        array('phone' => array('title' => ts('Phone'),
+        'order_bys' => array(
+          'phone' => array(
+            'title' => ts('Phone'),
             'required' => TRUE,
-          )),
+          ),
+        ),
       ),
       'civicrm_address' =>
       array(
         'dao' => 'CRM_Core_DAO_Address',
-        'fields' =>
-        array(
-          'street_address' =>
-          array('default' => TRUE),
-          'city' =>
-          array('default' => TRUE),
-          'postal_code' =>
-          array(
+        'fields' => array(
+          'street_address' => array(
+            'default' => TRUE,
+          ),
+          'city' => array(
+            'default' => TRUE,
+          ),
+          'postal_code' => array(
             'title' => 'Zip',
             'default' => TRUE,
           ),
-          'state_province_id' =>
-          array('title' => ts('State/Province'),
+          'state_province_id' => array(
+            'title' => ts('State/Province'),
             'default' => TRUE,
           ),
-          'country_id' =>
-          array('title' => ts('Country'),
+          'country_id' => array(
+            'title' => ts('Country'),
           ),
         ),
-        'filters' =>
-        array(
+        'filters' => array(
           'street_address' => NULL,
           'city' => NULL,
           'postal_code' => array('title' => 'Zip'),
         ),
         'grouping' => 'location-fields',
       ),
-      'civicrm_email' =>
-      array(
+      'civicrm_email' => array(
         'dao' => 'CRM_Core_DAO_Email',
-        'fields' =>
-        array('email' => NULL),
+        'fields' => array('email' => NULL),
         'grouping' => 'location-fields',
       ),
-      'civicrm_contact' =>
-      array(
+      'civicrm_contact' => array(
         'dao' => 'CRM_Contact_DAO_Contact',
-        'fields' =>
-        array(
-          'id' =>
-          array('title' => ts('Contact ID'),
+        'fields' => array(
+          'id' => array(
+            'title' => ts('Contact ID'),
             'required' => TRUE,
           ),
-          'display_name' =>
-          array('title' => ts('Contact Name'),
+          'display_name' => array(
+            'title' => ts('Contact Name'),
             'required' => TRUE,
             'no_repeat' => TRUE,
           ),
-          'gender_id' =>
-          array('title' => ts('Sex'),
+          'gender_id' => array(
+            'title' => ts('Sex'),
             'required' => TRUE,
           ),
-          'birth_date' =>
-          array('title' => ts('Age'),
+          'birth_date' => array(
+            'title' => ts('Age'),
             'required' => TRUE,
             'type' => CRM_Report_FORM::OP_INT,
           ),
         ),
-        'filters' =>
-        array(
-          'sort_name' =>
-          array('title' => ts('Contact Name'),
+        'filters' => array(
+          'sort_name' => array(
+            'title' => ts('Contact Name'),
             'operator' => 'like',
           ),
         ),
         'grouping' => 'contact-fields',
       ),
-      $this->_demoTable =>
-      array(
+      $this->_demoTable => array(
         'dao' => 'CRM_Contact_DAO_Contact',
-        'fields' =>
-        array(
-          $this->_demoLangCol =>
-          array(
+        'fields' => array(
+          $this->_demoLangCol => array(
             'type' => CRM_Report_FORM::OP_STRING,
             'required' => TRUE,
             'title' => ts('Language'),
           ),
         ),
-        'filters' =>
-        array(
-          $this->_demoLangCol =>
-          array(
+        'filters' => array(
+          $this->_demoLangCol => array(
             'title' => ts('Language'),
             'operatorType' => CRM_Report_FORM::OP_SELECT,
             'type' => CRM_Report_FORM::OP_STRING,
@@ -154,19 +145,15 @@ function __construct() {
         ),
         'grouping' => 'contact-fields',
       ),
-      $this->_coreInfoTable =>
-      array(
+      $this->_coreInfoTable => array(
         'dao' => 'CRM_Contact_DAO_Contact',
-        'fields' =>
-        array(
-          $this->_coreTypeCol =>
-          array(
+        'fields' => array(
+          $this->_coreTypeCol => array(
             'type' => CRM_Report_FORM::OP_STRING,
             'required' => TRUE,
             'title' => ts('Constituent Type'),
           ),
-          $this->_coreOtherCol =>
-          array(
+          $this->_coreOtherCol => array(
             'no_display' => TRUE,
             'type' => CRM_Report_Form::OP_STRING,
             'required' => TRUE,
@@ -174,14 +161,11 @@ function __construct() {
         ),
         'grouping' => 'contact-fields',
       ),
-      'civicrm_group' =>
-      array(
+      'civicrm_group' => array(
         'dao' => 'CRM_Contact_DAO_GroupContact',
         'alias' => 'cgroup',
-        'filters' =>
-        array(
-          'gid' =>
-          array(
+        'filters' => array(
+          'gid' => array(
             'name' => 'group_id',
             'title' => ts('Group'),
             'operatorType' => CRM_Report_Form::OP_MULTISELECT,
@@ -193,7 +177,7 @@ function __construct() {
     );
   }
 
-  function preProcess() {
+  public function preProcess() {
     parent::preProcess();
     $reportDate = CRM_Utils_Date::customFormat(date('Y-m-d H:i'));
     $this->assign('reportTitle', "{$this->_orgName} - Call List <br /> {$reportDate}");
@@ -202,7 +186,7 @@ function preProcess() {
   /**
    *  Generate WHERE clauses for SQL SELECT
    */
-  function where() {
+  public function where() {
     //  Don't list anybody who doesn't have a phone
     //  or has do_not_phone = 1
     $clauses = array(
@@ -271,7 +255,7 @@ function where() {
   /**
    *  Process submitted form
    */
-  function postProcess() {
+  public function postProcess() {
     parent::postProcess();
   }
 
@@ -279,7 +263,7 @@ function postProcess() {
    *  Convert contact type info from fields separated by \x01 to a
    *  string of fields separated by commas
    */
-  function type2str($type) {
+  public function type2str($type) {
     $typeArray = explode("\x01", $type);
     foreach ($typeArray as $key => $value) {
       if (empty($value)) {
@@ -289,7 +273,7 @@ function type2str($type) {
     return implode(', ', $typeArray);
   }
 
-  function alterDisplay(&$rows) {
+  public function alterDisplay(&$rows) {
     // custom code to alter rows
     $genderList = CRM_Core_PseudoConstant::get('CRM_Contact_DAO_Contact', 'gender_id');
     $entryFound = FALSE;
@@ -439,5 +423,5 @@ function alterDisplay(&$rows) {
       $this->_columnHeaders = $this->_columnHeaders + $tempHeaders;
     }
   }
-}
 
+}
diff --git a/modules/civicrm_engage/Engage/Report/Form/List.php b/modules/civicrm_engage/Engage/Report/Form/List.php
index 6c33ead..73816d1 100644
--- a/modules/civicrm_engage/Engage/Report/Form/List.php
+++ b/modules/civicrm_engage/Engage/Report/Form/List.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        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  *
@@ -42,59 +42,59 @@
  */
 class Engage_Report_Form_List extends CRM_Report_Form {
   /*
-     * Note: In order to detect column names of a particular custom group, we need to know 
-     * custom field ID or LABEL. Since labels are less likely to change on initial setup of the module, 
-     * we 'll use label constants for now.
-     *
-     * Please note these values 'll need to be adjusted if custom field labels are modified.
-     *
-     */
-  CONST CF_CONSTITUENT_TYPE_NAME = 'constituent_type', CF_OTHER_NAME_NAME = 'other_name', CG_VOTER_INFO_TABLE = 'civicrm_value_voter_info', CF_PARTY_REG_NAME = 'party_registration', CF_VOTER_HISTORY_NAME = 'voter_history', CG_DEMOGROPHICS_TABLE = 'civicrm_value_demographics';
+   * Note: In order to detect column names of a particular custom group, we need to know
+   * custom field ID or LABEL. Since labels are less likely to change on initial setup of the module,
+   * we 'll use label constants for now.
+   *
+   * Please note these values 'll need to be adjusted if custom field labels are modified.
+   *
+   */
+  const CF_CONSTITUENT_TYPE_NAME = 'constituent_type', CF_OTHER_NAME_NAME = 'other_name', CG_VOTER_INFO_TABLE = 'civicrm_value_voter_info', CF_PARTY_REG_NAME = 'party_registration', CF_VOTER_HISTORY_NAME = 'voter_history', CG_DEMOGROPHICS_TABLE = 'civicrm_value_demographics';
 
   /**
-   *  Address information needed in output
-   *  @var boolean
+   * Address information needed in output
+   * @var boolean
    */
   protected $_addressField = FALSE;
 
   /**
-   *  Email address needed in output
-   *  @var boolean
+   * Email address needed in output
+   * @var boolean
    */
   protected $_emailField = FALSE;
 
   /**
-   *  Demographic information needed in output
-   *  @var boolean
+   * Demographic information needed in output
+   * @var boolean
    */
   protected $_demoField = FALSE;
 
   protected $_coreField = FALSE;
 
   /**
-   *  Phone number needed in output
-   *  @var boolean
+   * Phone number needed in output
+   * @var boolean
    */
   protected $_phoneField = FALSE;
 
   /**
-   *  Group membership information needed in output
-   *  @var boolean
+   * Group membership information needed in output
+   * @var boolean
    */
   protected $_groupField = FALSE;
 
   /**
-   *  Voter Info information needed in output
-   *  @var boolean
+   * Voter Info information needed in output
+   * @var boolean
    */
   protected $_voterInfoField = FALSE;
 
   protected $_contributionField = FALSE;
 
   /**
-   *  Constituent individual table name has changed
-   *  between versions of civicrm. Populate this field
-   *  dynamically to ensure backward compatability
+   * Constituent individual table name has changed
+   * between versions of civicrm. Populate this field
+   * dynamically to ensure backward compatability
    */
   protected $_constituentIndividualTable = FALSE;
 
@@ -107,36 +107,36 @@ class Engage_Report_Form_List extends CRM_Report_Form {
   protected $_summary = NULL;
 
   /**
-   *  Available contact type options
-   *  @var string[]
+   * Available contact type options
+   * @var string[]
    */
   protected $_contactType = NULL;
 
   /**
-   *  Available gender options
-   *  @var string[]
+   * Available gender options
+   * @var string[]
    */
   protected $_gender = NULL;
 
   /**
-   *  Available group options
-   *  @var string[]
+   * Available group options
+   * @var string[]
    */
   protected $_groups = NULL;
 
   protected $_groupDescr = NULL;
 
   /**
-   *  Available primary language options
-   *  @var string[]
+   * Available primary language options
+   * @var string
    */
   protected $_languages = NULL;
 
   protected $_orgName = NULL;
 
   /**
-   *  Table with Voter Info group information
-   *  @var string
+   * Table with Voter Info group information
+   * @var string
    */
   protected $_voterInfoTable;
 
@@ -151,20 +151,20 @@ class Engage_Report_Form_List extends CRM_Report_Form {
   protected $_coreOtherCol;
 
   /**
-   *  Column in $_voterInfoTable with party registration information
-   *  @var string
+   * Column in $_voterInfoTable with party registration information
+   * @var string
    */
   protected $_partyCol;
 
   /**
-   *  Available party registration options
-   *  @var string[]
+   * Available party registration options
+   * @var string[]
    */
   protected $_partyRegs = array();
 
   /**
-   *  Column in $_voterInfoTable with voter history information
-   *  @var string
+   * Column in $_voterInfoTable with voter history information
+   * @var string
    */
   protected $_vhCol; function __construct() {
     // Find the invidual constituent table (varies between versions)
@@ -221,7 +221,6 @@ class Engage_Report_Form_List extends CRM_Report_Form {
       $this->_contactType[$dao->value] = $dao->label;
     }
 
-
     // ** demographics ** //
     $query = "SELECT id, table_name FROM civicrm_custom_group WHERE table_name='" . self::CG_DEMOGROPHICS_TABLE . "'";
     $dao = CRM_Core_DAO::executeQuery($query);
@@ -260,7 +259,6 @@ class Engage_Report_Form_List extends CRM_Report_Form {
     $dao->fetch();
     $this->_coreTypeCol = $dao->column_name;
 
-
     //  Get language option values, English on top
     $this->_languages = array('' => '');
     $query = "
@@ -285,7 +283,7 @@ class Engage_Report_Form_List extends CRM_Report_Form {
     parent::__construct();
   }
 
-  function setDefaultValues($freeze = TRUE) {
+  public function setDefaultValues($freeze = TRUE) {
     $defaults = parent::setDefaultValues($freeze);
     $defaults['report_header'] = '
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
@@ -348,13 +346,14 @@ function setDefaultValues($freeze = TRUE) {
     return $defaults;
   }
 
-  function preProcess() {
+  public function preProcess() {
     parent::preProcess();
   }
 
-  function getOperationPair($type = "string", $fieldName = NULL) {
+  public function getOperationPair($type = "string", $fieldName = NULL) {
     if ($fieldName == 'gid' && $type == CRM_Report_Form::OP_MULTISELECT) {
-      return array('in' => ts('Is one of'),
+      return array(
+        'in' => ts('Is one of'),
         'mand' => ts('Is equal to'),
       );
     }
@@ -363,7 +362,7 @@ function getOperationPair($type = "string", $fieldName = NULL) {
     }
   }
 
-  function engageWhereGroupClause($clause) {
+  public function engageWhereGroupClause($clause) {
     $smartGroupQuery = "";
     require_once 'CRM/Contact/DAO/Group.php';
     require_once 'CRM/Contact/BAO/SavedSearch.php';
@@ -418,7 +417,7 @@ function engageWhereGroupClause($clause) {
     }
   }
 
-  function select() {
+  public function select() {
     $select = array();
     //var_dump($this->_params);
     $this->_columnHeaders = array();
@@ -465,7 +464,7 @@ function select() {
   }
 
   /**
-   *  Generate FROM clause for SQL SELECT
+   * Generate FROM clause for SQL SELECT
    */
   protected function from() {
 
@@ -502,14 +501,13 @@ protected function from() {
       $this->_from .= " LEFT JOIN " . $this->_coreInfoTable . "   AS " . $this->_aliases[$this->_coreInfoTable] . " ON {$this->_aliases['civicrm_contact']}.id =" . $this->_aliases[$this->_coreInfoTable] . ".entity_id\n";
     }
 
-
     if ($this->_voterInfoField) {
       $this->_from .= " LEFT JOIN {$this->_voterInfoTable}" . "   AS {$this->_aliases[$this->_voterInfoTable]}" . " ON {$this->_aliases['civicrm_contact']}.id =" . "{$this->_aliases[$this->_voterInfoTable]}.entity_id\n";
     }
   }
 
   /**
-   *  Interpret the 'order_by' keys in selected fields
+   * Interpret the 'order_by' keys in selected fields
    */
   public function orderBy() {
     $this->_orderBy = "";
@@ -524,10 +522,10 @@ public function orderBy() {
   }
 
   /**
-   *  Convert a string of fields separated by \x01 to a
-   *  string of fields separated by commas
+   * Convert a string of fields separated by \x01 to a
+   * string of fields separated by commas
    */
-  function hexOne2str($hexOne) {
+  public function hexOne2str($hexOne) {
     $hexOneArray = explode("\x01", $hexOne);
     foreach ($hexOneArray as $key => $value) {
       if (empty($value)) {
@@ -538,24 +536,24 @@ function hexOne2str($hexOne) {
   }
 
   /**
-   *  Convert MySQL YYYY-MM-DD HH:MM:SS date of birth timestamp to
-   *  current age
+   * Convert MySQL YYYY-MM-DD HH:MM:SS date of birth timestamp to
+   * current age
    */
-  function dob2age($myTimestamp) {
+  public function dob2age($myTimestamp) {
     //  Separate parts of DOB timestamp
     $matches = array();
     preg_match('/(\d\d\d\d)-(\d\d)-(\d\d)/',
       $myTimestamp, $matches
     );
     //var_dump($matches);
-    $dobYear  = (int)$matches[1];
-    $dobMonth = (int)$matches[2];
-    $dobDay   = (int)$matches[3];
+    $dobYear = (int) $matches[1];
+    $dobMonth = (int) $matches[2];
+    $dobDay  = (int) $matches[3];
     //echo "DOB year=$dobYear month=$dobMonth day=$dobDay<br>";
 
-    $nowYear  = (int)strftime('%Y');
-    $nowMonth = (int)strftime('%m');
-    $nowDay   = (int)strftime('%d');
+    $nowYear = (int) strftime('%Y');
+    $nowMonth = (int) strftime('%m');
+    $nowDay  = (int) strftime('%d');
     //echo "Now year=$nowYear month=$nowMonth day=$nowDay<br>";
     //  Calculate age
     if ($dobMonth < $nowMonth) {
@@ -581,5 +579,5 @@ function dob2age($myTimestamp) {
     //echo "age=$age years<br>";
     return $age;
   }
-}
 
+}
diff --git a/modules/civicrm_engage/Engage/Report/Form/WalkList.php b/modules/civicrm_engage/Engage/Report/Form/WalkList.php
index d237f77..20c39eb 100644
--- a/modules/civicrm_engage/Engage/Report/Form/WalkList.php
+++ b/modules/civicrm_engage/Engage/Report/Form/WalkList.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        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  *
@@ -40,28 +40,23 @@
  *  Generate a walk list
  */
 class Engage_Report_Form_WalkList extends Engage_Report_Form_List {
-  function __construct() {
+  public function __construct() {
 
     parent::__construct();
 
     //  Walk list columns
     $this->_columns = array(
-      $this->_demoTable =>
-      array(
+      $this->_demoTable => array(
         'dao' => 'CRM_Contact_DAO_Contact',
-        'fields' =>
-        array(
-          $this->_demoLangCol =>
-          array(
+        'fields' => array(
+          $this->_demoLangCol => array(
             'type' => CRM_Report_Form::OP_STRING,
             'required' => TRUE,
             'title' => ts('Language'),
           ),
         ),
-        'filters' =>
-        array(
-          $this->_demoLangCol =>
-          array(
+        'filters' => array(
+          $this->_demoLangCol => array(
             'title' => ts('Language'),
             'operatorType' => CRM_Report_Form::OP_SELECT,
             'type' => CRM_Report_Form::OP_STRING,
@@ -70,28 +65,22 @@ function __construct() {
         ),
         'grouping' => 'contact-fields',
       ),
-      $this->_coreInfoTable =>
-      array(
+      $this->_coreInfoTable => array(
         'dao' => 'CRM_Contact_DAO_Contact',
-        'fields' =>
-        array(
-          $this->_coreTypeCol =>
-          array(
+        'fields' => array(
+          $this->_coreTypeCol => array(
             'type' => CRM_Report_Form::OP_STRING,
             'required' => TRUE,
             'title' => ts('Constituent Type'),
           ),
-          $this->_coreOtherCol =>
-          array(
+          $this->_coreOtherCol => array(
             'type' => CRM_Report_Form::OP_STRING,
             'required' => TRUE,
             'title' => ts('Other Name'),
           ),
         ),
-        'filters' =>
-        array(
-          $this->_coreTypeCol =>
-          array(
+        'filters' => array(
+          $this->_coreTypeCol => array(
             'title' => ts('Constituent Type'),
             'operatorType' => CRM_Report_Form::OP_SELECT,
             'type' => CRM_Report_Form::OP_STRING,
@@ -100,127 +89,116 @@ function __construct() {
         ),
         'grouping' => 'contact-fields',
       ),
-      'civicrm_contact' =>
-      array(
+      'civicrm_contact' => array(
         'dao' => 'CRM_Contact_DAO_Contact',
-        'fields' =>
-        array(
-          'gender_id' =>
-          array('title' => ts('Sex'),
+        'fields' => array(
+          'gender_id' => array(
+            'title' => ts('Sex'),
             'required' => TRUE,
           ),
-          'birth_date' =>
-          array('title' => ts('Age'),
+          'birth_date' => array(
+            'title' => ts('Age'),
             'required' => TRUE,
             'type' => CRM_Report_Form::OP_INT,
           ),
-          'id' =>
-          array('title' => ts('Contact ID'),
+          'id' => array(
+            'title' => ts('Contact ID'),
             'required' => TRUE,
           ),
-          'display_name' =>
-          array('title' => ts('Contact Name'),
+          'display_name' => array(
+            'title' => ts('Contact Name'),
             'required' => TRUE,
             'no_repeat' => TRUE,
           ),
         ),
-        'filters' =>
-        array(
-          'gender_id' =>
-          array('title' => ts('Sex'),
+        'filters' => array(
+          'gender_id' => array(
+            'title' => ts('Sex'),
             'operatorType' => CRM_Report_Form::OP_SELECT,
             'type' => CRM_Report_Form::OP_STRING,
             'options' => array('' => '') + CRM_Core_PseudoConstant::get('CRM_Contact_DAO_Contact', 'gender_id'),
           ),
-          'sort_name' =>
-          array('title' => ts('Contact Name'),
+          'sort_name' => array(
+            'title' => ts('Contact Name'),
             'operator' => 'like',
           ),
         ),
         'grouping' => 'contact-fields',
-        'order_bys' =>
-        array('sort_name' => array('title' => ts('Contact Name'),
+        'order_bys' => array(
+          'sort_name' => array(
+            'title' => ts('Contact Name'),
             'required' => TRUE,
-          )),
+          ),
+        ),
       ),
-      'civicrm_address' =>
-      array(
+      'civicrm_address' => array(
         'dao' => 'CRM_Core_DAO_Address',
-        'fields' =>
-        array(
-          'street_number' =>
-          array(
+        'fields' => array(
+          'street_number' => array(
             'required' => TRUE,
             'title' => ts('Street#'),
           ),
-          'street_name' =>
-          array('title' => ts('Street Name'),
+          'street_name' => array(
+            'title' => ts('Street Name'),
             'nodisplay' => TRUE,
             'required' => TRUE,
           ),
-          'street_address' =>
-          array(
+          'street_address' => array(
             'required' => TRUE,
             'title' => ts('Street Address'),
           ),
-          'street_unit' =>
-          array(
+          'street_unit' => array(
             'required' => TRUE,
             'title' => ts('Apt.'),
           ),
-          'city' =>
-          array('required' => TRUE),
-          'postal_code' =>
-          array(
+          'city' => array(
+            'required' => TRUE,
+          ),
+          'postal_code' => array(
             'title' => 'Zip',
             'required' => TRUE,
           ),
-          'state_province_id' =>
-          array('title' => ts('State/Province'),
+          'state_province_id' => array(
+            'title' => ts('State/Province'),
             'required' => TRUE,
           ),
-          'country_id' =>
-          array('title' => ts('Country'),
+          'country_id' => array(
+            'title' => ts('Country'),
           ),
         ),
-        'filters' =>
-        array(
+        'filters' => array(
           'street_address' => NULL,
           'city' => NULL,
           'postal_code' => array('title' => 'Zip'),
         ),
         'grouping' => 'location-fields',
       ),
-      'civicrm_phone' =>
-      array(
+      'civicrm_phone' => array(
         'dao' => 'CRM_Core_DAO_Phone',
-        'fields' =>
-        array(
-          'phone' => array('default' => TRUE,
+        'fields' => array(
+          'phone' => array(
+            'default' => TRUE,
             'required' => TRUE,
-          )),
+          ),
+        ),
         'grouping' => 'location-fields',
       ),
-      'civicrm_email' =>
-      array(
+      'civicrm_email' => array(
         'dao' => 'CRM_Core_DAO_Email',
-        'fields' =>
-        array('email' => NULL),
+        'fields' => array(
+          'email' => NULL,
+        ),
         'grouping' => 'location-fields',
       ),
-      $this->_voterInfoTable =>
-      array(
+      $this->_voterInfoTable => array(
         'dao' => 'CRM_Contact_DAO_Contact',
-        'fields' =>
-        array(
-          $this->_partyCol =>
-          array(
+        'fields' => array(
+          $this->_partyCol => array(
             'type' => CRM_Report_Form::OP_STRING,
             'required' => TRUE,
             'title' => ts('Party Reg'),
           ),
-          $this->_vhCol =>
-          array(
+          $this->_vhCol => array(
             'type' => CRM_Report_Form::OP_STRING,
             'required' => TRUE,
             'title' => ts('VH'),
@@ -229,14 +207,11 @@ function __construct() {
         'filters' => array(),
         'grouping' => 'contact-fields',
       ),
-      'civicrm_group' =>
-      array(
+      'civicrm_group' => array(
         'dao' => 'CRM_Contact_DAO_GroupContact',
         'alias' => 'cgroup',
-        'filters' =>
-        array(
-          'gid' =>
-          array(
+        'filters' => array(
+          'gid' => array(
             'name' => 'group_id',
             'title' => ts('Group'),
             'operatorType' => CRM_Report_Form::OP_MULTISELECT,
@@ -245,19 +220,20 @@ function __construct() {
           ),
         ),
       ),
-      'civicrm_contribution_lastcont' =>
-      array(
+      'civicrm_contribution_lastcont' => array(
         'dao' => 'CRM_Contribute_DAO_Contribution',
       ),
-      'civicrm_contribution_cont' =>
-      array(
+      'civicrm_contribution_cont' => array(
         'dao' => 'CRM_Contribute_DAO_Contribution',
         'alias' => 'cont',
-        'fields' =>
-        array(
-          'receive_date' => array('default' => TRUE, 'title' => 'Last Receipt'),
+        'fields' => array(
+          'receive_date' => array(
+            'default' => TRUE,
+            'title' => 'Last Receipt',
+          ),
           'total_amount' => array(
-            'default' => TRUE, 'title' => 'Amount received',
+            'default' => TRUE,
+            'title' => 'Amount received',
           ),
         ),
       ),
@@ -268,7 +244,7 @@ function __construct() {
    *  Generate WHERE clauses for SQL SELECT
    *  FIXME: deal with age filter
    */
-  function where() {
+  public function where() {
     $clauses = array("{$this->_aliases['civicrm_address']}.id IS NOT NULL");
 
     foreach ($this->_columns as $tableName => $table) {
@@ -330,11 +306,11 @@ function where() {
   /**
    *  Process submitted form
    */
-  function postProcess() {
+  public function postProcess() {
     parent::postProcess();
   }
 
-  function alterDisplay(&$rows) {
+  public function alterDisplay(&$rows) {
 
     if ($this->_outputMode == 'print' || $this->_outputMode == 'pdf') {
       $this->executePrintmode($rows);
@@ -417,7 +393,7 @@ function alterDisplay(&$rows) {
     $this->_columnHeaders = $this->_columnHeaders + $tempHeaders;
   }
 
-  function executePrintmode($rows) {
+  public function executePrintmode($rows) {
     //only get these last contribution related variables in print mode if selected on previous form
     if (array_key_exists('civicrm_contribution_cont_receive_date', $rows[0])) {
       $receiveDate = ', date_received   DATE';
@@ -458,12 +434,11 @@ function executePrintmode($rows) {
 
       $dob  = $value['civicrm_contact_birth_date'];
       $age  = empty($dob) ? 0 : $this->dob2age($dob);
-      if (!empty($value['civicrm_contact_gender_id'])){
+      if (!empty($value['civicrm_contact_gender_id'])) {
         $sex  = $gender[CRM_Utils_Array::value('civicrm_contact_gender_id', $value)];
       }
       $sex  = empty($sex) ? '' : $sex;
-      $lang = strtoupper(substr($value[$this->_demoTable . '_' . $this->_demoLangCol], 0, 2
-        ));
+      $lang = strtoupper(substr($value[$this->_demoTable . '_' . $this->_demoLangCol], 0, 2));
       $party       = substr($value["{$this->_voterInfoTable}_{$this->_partyCol}"], 0, 1);
       $vh          = substr($value["{$this->_voterInfoTable}_{$this->_vhCol}"], 0, 1);
       $contactType = $value[$this->_coreInfoTable . '_' . $this->_coreTypeCol];
@@ -473,7 +448,7 @@ function executePrintmode($rows) {
       if (!empty($contactType)) {
         $type = $this->hexOne2str($contactType);
       }
-      $contact_id = (int)$value['civicrm_contact_id'];
+      $contact_id = (int) $value['civicrm_contact_id'];
 
       $state = '';
       if (!empty($value['civicrm_address_state_province_id'])) {
@@ -483,8 +458,8 @@ function executePrintmode($rows) {
       }
 
       $sStreetNumber = $value['civicrm_address_street_number'];
-      $iStreetNumber = $value['civicrm_address_street_number'] ? (int)$value['civicrm_address_street_number'] : 0;
-      $odd           = $value['civicrm_address_street_number'] ? ((int)$value['civicrm_address_street_number'] % 2) : 0;
+      $iStreetNumber = $value['civicrm_address_street_number'] ? (int) $value['civicrm_address_street_number'] : 0;
+      $odd           = $value['civicrm_address_street_number'] ? ((int) $value['civicrm_address_street_number'] % 2) : 0;
       $apt_number    = $value['civicrm_address_street_number'] ? $value['civicrm_address_street_number'] : '';
       $phone_number  = $value['civicrm_phone_phone'] ? $value['civicrm_phone_phone'] : '';
       $query         = "INSERT INTO {$tempTable} SET
@@ -508,7 +483,7 @@ function executePrintmode($rows) {
                        contact_id      = %18";
       $params = array(
         1 => array($value['civicrm_address_street_name'] ? $value['civicrm_address_street_name'] : '', 'String'),
-        2 => array((String )$sStreetNumber, 'String'),
+        2 => array((String) $sStreetNumber, 'String'),
         3 => array($iStreetNumber, 'Integer'),
         4 => array($odd, 'Integer'),
         5 => array((String) $apt_number , 'String'),
@@ -516,7 +491,7 @@ function executePrintmode($rows) {
         7 => array((String) $state , 'String'),
         8 => array($value['civicrm_address_postal_code'] ? $value['civicrm_address_postal_code'] : '', 'String'),
         9 => array($value['civicrm_contact_display_name'] ? $value['civicrm_contact_display_name'] : '', 'String'),
-        10 => array((String)  $phone_number, 'String'),
+        10 => array((String) $phone_number, 'String'),
         11 => array($age, 'Integer'),
         12 => array((String) $sex, 'String'),
         13 => array((String) $lang, 'String'),
@@ -560,7 +535,8 @@ function executePrintmode($rows) {
     $groupRows   = array();
     $groupCounts = 0;
 
-    $pdfHeaders = array('s_street_number' => array('title' => 'STREET#'),
+    $pdfHeaders = array(
+      's_street_number' => array('title' => 'STREET#'),
       'apt_number' => array('title' => 'APT'),
       'name' => array('title' => 'Name'),
       'phone' => array('title' => 'PHONE'),
@@ -589,13 +565,11 @@ function executePrintmode($rows) {
       $pdfHeaders['total_amount'] = array('title' => 'Last donation');
     }
 
-
     $groupInfo = array(
       'date' => $reportDate,
       'descr' => empty($this->_groupDescr) ? '' : "<br>Group {$this->_groupDescr}",
     );
 
-
     while ($dao->fetch()) {
 
       if (strtolower($state) != strtolower($dao->state)
@@ -665,5 +639,5 @@ function executePrintmode($rows) {
     $this->assign('pdfRows', $pdfRows);
     $this->assign('groupRows', $groupRows);
   }
-}
 
+}
diff --git a/modules/civicrm_engage/civicrm_engage.admin.inc b/modules/civicrm_engage/civicrm_engage.admin.inc
index 7af83d0..7a15025 100644
--- a/modules/civicrm_engage/civicrm_engage.admin.inc
+++ b/modules/civicrm_engage/civicrm_engage.admin.inc
@@ -1,5 +1,7 @@
 <?php
-#http://pastebin.com/U32jjBVu - D7 has renamed admin settings
+/**
+ * http://pastebin.com/U32jjBVu - D7 has renamed admin settings
+ */
 function civicrm_engage_admin_settings($form_state = NULL) {
   $form['last_donate'] = array(
     '#type' => 'fieldset',
@@ -34,7 +36,7 @@ function civicrm_engage_admin_settings($form_state = NULL) {
     '#default_value' => variable_get('civicrm_engage_groupbreak_odd_even', "1"),
   );
   $form['break_settings']['civicrm_engage_groupbreak_street'] = array(
-    '#title' => t("Group break on street "),
+    '#title' => t("Group break on street"),
     '#type' => 'checkbox',
     '#description' => t('Do you want a group-break between each street'),
     '#default_value' => variable_get('civicrm_engage_groupbreak_street', "1"),
@@ -68,23 +70,23 @@ function civicrm_engage_admin_settings($form_state = NULL) {
 
 function civicrm_engage_admin_load_data($form_state = NULL) {
   $subtypes_added = NULL;
-  if(civicrm_engage_subtypes_added()) {
+  if (civicrm_engage_subtypes_added()) {
     $subtypes_added = ' <em>' . t("It appears that the contact sub types are present.") . '</em>';
-  } 
+  }
   $custom_data_added = NULL;
-  if(civicrm_engage_custom_data_added()) {
+  if (civicrm_engage_custom_data_added()) {
     $custom_data_added = ' <em>' . t("It appears that the custom data is present.") . '</em>';
   }
   $custom_voter_us_data_added = NULL;
-  if(civicrm_engage_custom_voter_us_data_added()) {
+  if (civicrm_engage_custom_voter_us_data_added()) {
     $custom_voter_us_data_added = ' <em>' . t("It appears that the US custom voter data is present.") . '</em>';
   }
   $address_parsing_enabled = NULL;
-  if(civicrm_engage_address_parsing_enabled()) {
+  if (civicrm_engage_address_parsing_enabled()) {
     $address_parsing_enabled = ' <em>' . t("It appears that address parsing is enabled.") . '</em>';
-  } 
+  }
   $autocomplete_options_set = NULL;
-  if(civicrm_engage_autocomplete_options_set()) {
+  if (civicrm_engage_autocomplete_options_set()) {
     $autocomplete_options_set = ' <em>' . t("It appears that the autocomplete options are properly set.") . '</em>';
   }
   $form['load_data'] = array(
@@ -98,91 +100,99 @@ function civicrm_engage_admin_load_data($form_state = NULL) {
   $form['load_data']['contact_subtypes'] = array(
     '#type' => 'checkbox',
     '#title' => t('Add contact subtypes'),
-    '#description' => t("Civicrm Engage depends on the presence of a Media, Funder, Elected Official, Media Outlet and Foundation contact subtypes. Check this box to add them. This step is not reversible.") . $subtypes_added
-  ); 
+    '#description' => t("Civicrm Engage depends on the presence of a Media, Funder, Elected Official, Media Outlet and Foundation contact subtypes. Check this box to add them. This step is not reversible.") . $subtypes_added,
+  );
   $form['load_data']['address_parsing'] = array(
     '#type' => 'checkbox',
     '#title' => t('Enable address parsing'),
-    '#description' => t("Street parsing is required for walk lists because it needs to sort by even/odd address numbers.") . $address_parsing_enabled
+    '#description' => t("Street parsing is required for walk lists because it needs to sort by even/odd address numbers.") . $address_parsing_enabled,
   );
   $form['load_data']['autocomplete_options'] = array(
     '#type' => 'checkbox',
     '#title' => t('Set phone to autocomplete'),
-    '#description' => t("Autocomplete options double as indicator of whether a field should show up in batch update. For civicrm engage to work properly, phone should be set to autocomplete so it shows up in batch update.") . $autocomplete_options_set
+    '#description' => t("Autocomplete options double as indicator of whether a field should show up in batch update. For civicrm engage to work properly, phone should be set to autocomplete so it shows up in batch update.") . $autocomplete_options_set,
   );
   $form['load_data']['custom_data'] = array(
     '#type' => 'checkbox',
     '#title' => t('Add general custom groups, fields and other data'),
-    '#description' => t("Civicrm Engage depends on a number of custom data groups and fields and profiles. Check this box to add them. This step is not reversible and will take several minutes to complete.") . $custom_data_added
+    '#description' => t("Civicrm Engage depends on a number of custom data groups and fields and profiles. Check this box to add them. This step is not reversible and will take several minutes to complete.") . $custom_data_added,
   );
   $form['load_data']['custom_voter_us_data'] = array(
     '#type' => 'checkbox',
     '#title' => t('Add US voter custom groups, fields and other data'),
-    '#description' => t("Civicrm Engage depends on voter-related fields being imported (to track congressional district, city district, etc.). Current only US-specific voter fields are available.") . $custom_voter_us_data_added
+    '#description' => t("Civicrm Engage depends on voter-related fields being imported (to track congressional district, city district, etc.). Current only US-specific voter fields are available.") . $custom_voter_us_data_added,
   );
   $form['load_data']['submit'] = array(
     '#type' => 'submit',
-    '#value' => 'Submit'
+    '#value' => 'Submit',
   );
   return $form;
 }
 
 
 function civicrm_engage_admin_load_data_submit($form, &$form_state) {
-  if($form_state['values']['contact_subtypes'] == 1) {
+  if ($form_state['values']['contact_subtypes'] == 1) {
     civicrm_engage_load_contact_subtypes();
   }
-  if($form_state['values']['custom_data'] == 1) {
+  if ($form_state['values']['custom_data'] == 1) {
     civicrm_engage_load_custom_data();
   }
-  if($form_state['values']['custom_voter_us_data'] == 1) {
+  if ($form_state['values']['custom_voter_us_data'] == 1) {
     civicrm_engage_load_custom_voter_us_data();
   }
-  if($form_state['values']['address_parsing'] == 1) {
+  if ($form_state['values']['address_parsing'] == 1) {
     civicrm_engage_enable_address_parsing();
   }
-  if($form_state['values']['autocomplete_options'] == 1) {
+  if ($form_state['values']['autocomplete_options'] == 1) {
     civicrm_engage_set_autocomplete_options();
   }
 }
 
 /**
  * Check to see if the subtypes have already been added.
- **/
+ */
 function civicrm_engage_subtypes_added() {
   civicrm_initialize();
-  require_once ("CRM/Contact/BAO/ContactType.php");
+  require_once "CRM/Contact/BAO/ContactType.php";
   $existing_types = CRM_Contact_BAO_ContactType::subTypeInfo();
-  if(array_key_exists('Media_Outlet', $existing_types)) {
-    return true;
+  if (array_key_exists('Media_Outlet', $existing_types)) {
+    return TRUE;
   }
-  return false;
+  return FALSE;
 }
 
 /**
- * Check to see if the custom data has already been added. 
- **/
+ * Check to see if the custom data has already been added.
+ */
 function civicrm_engage_custom_data_added() {
   civicrm_initialize();
   $sql = "SELECT is_active FROM civicrm_uf_group WHERE name = 'update_constituent_info'";
   $dao = CRM_Core_DAO::executeQuery($sql);
   $dao->fetch();
-  if(!property_exists($dao, 'is_active')) return false;
-  if($dao->is_active == 1) return true;
-  return false;
+  if (!property_exists($dao, 'is_active')) {
+    return FALSE;
+  }
+  if ($dao->is_active == 1) {
+    return TRUE;
+  }
+  return FALSE;
 }
 
 /**
- * Check to see if the custom voter us data has already been added. 
- **/
+ * Check to see if the custom voter us data has already been added.
+ */
 function civicrm_engage_custom_voter_us_data_added() {
   civicrm_initialize();
   $sql = "SELECT is_active FROM civicrm_uf_group WHERE name = 'update_voter_info'";
   $dao = CRM_Core_DAO::executeQuery($sql);
   $dao->fetch();
-  if(!property_exists($dao, 'is_active')) return false;
-  if($dao->is_active == 1) return true;
-  return false;
+  if (!property_exists($dao, 'is_active')) {
+    return FALSE;
+  }
+  if ($dao->is_active == 1) {
+    return TRUE;
+  }
+  return FALSE;
 }
 
 /**
@@ -225,7 +235,7 @@ function civicrm_engage_load_contact_subtypes() {
       'name' => 'Foundation',
     ),
   );
-  require_once ("CRM/Contact/BAO/ContactType.php");
+  require_once "CRM/Contact/BAO/ContactType.php";
   $existing_types = CRM_Contact_BAO_ContactType::subTypeInfo();
   while (list($k) = each($existing_types)) {
     if (array_key_exists($k, $create)) {
@@ -258,17 +268,17 @@ function civicrm_engage_load_custom_data() {
 /**
  * Create group that will be used to populate the responsible
  * staff custom data field.
- **/
+ */
 function civicrm_engage_load_staff_group() {
   // Record the id of the group we create so we can ensure that the
-  // staff responsible contact reference field is restricted to the 
+  // staff responsible contact reference field is restricted to the
   // right group.
   $id = NULL;
   try {
     // Check if it exists already
     $params = array('name' => 'staff');
     $result = civicrm_api3('Group', 'Get', $params);
-    if($result['count'] > 0) {
+    if ($result['count'] > 0) {
       // We already have the group in place.
       drupal_set_message(t("Staff group already exists."));
       $row = array_pop($result['values']);
@@ -283,18 +293,18 @@ function civicrm_engage_load_staff_group() {
         'is_active' => 1,
         'group_type' => '2',
         'is_hidden' => '0',
-        'is_reserved' => '0'
+        'is_reserved' => '0',
       );
       $result = civicrm_api3('Group', 'create', $params);
       drupal_set_message(t("Staff group created."));
       $row = array_pop($result['values']);
       $id = $row['id'];
     }
-    if($id) {
+    if ($id) {
       $sql = "UPDATE civicrm_custom_field SET filter = 'action=lookup&group=%0' WHERE
         name = 'staff_responsible' OR name = 'event_contact_person'";
       $params = array(
-        0 => array($id, 'Integer')
+        0 => array($id, 'Integer'),
       );
       CRM_Core_DAO::executeQuery($sql, $params);
     }
@@ -322,7 +332,7 @@ function civicrm_engage_address_parsing_enabled() {
     'address_options',
     TRUE, NULL, TRUE
   );
-  if($address_options['street_address_parsing'] == 1) {
+  if ($address_options['street_address_parsing'] == 1) {
     return TRUE;
   }
   return FALSE;
@@ -330,7 +340,7 @@ function civicrm_engage_address_parsing_enabled() {
 
 /**
  * Helper file to get path to civicrm_engage directory
- **/
+ */
 function civicrm_engage_get_absolute_module_path() {
   // we need to build the path to the Voter.us.xml file
   // shipped in the civicrm_engage directory. civicrm_engage could
@@ -372,7 +382,7 @@ function civicrm_engage_autocomplete_options_set() {
     'contact_autocomplete_options',
     TRUE, NULL, TRUE
   );
-  if($contact_autocomplete_options['phone'] == 1) {
+  if ($contact_autocomplete_options['phone'] == 1) {
     return TRUE;
   }
   return FALSE;
diff --git a/modules/civicrm_engage/civicrm_engage.install b/modules/civicrm_engage/civicrm_engage.install
index c4144dd..9e942ea 100644
--- a/modules/civicrm_engage/civicrm_engage.install
+++ b/modules/civicrm_engage/civicrm_engage.install
@@ -23,7 +23,7 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  *
@@ -34,8 +34,7 @@
  */
 
 /**
- * Implementation of hook_enable().
- *
+ * Implements hook_enable().
  */
 function civicrm_engage_enable() {
   db_query("UPDATE {system} SET weight = 110 WHERE name = 'civicrm_engage'");
@@ -44,14 +43,12 @@ function civicrm_engage_enable() {
 }
 
 /**
- * Fix the Participant Role field in the Update Event Invite Responses 
- **/
+ * Fix the Participant Role field in the Update Event Invite Responses
+ */
 function civicrm_engage_update_7001() {
   civicrm_initialize();
-  $sql = "UPDATE civicrm_uf_field SET field_name = 'participant_role' WHERE ".
-    "field_name = 'participant_role_id' AND uf_group_id IN (SELECT id FROM ".
+  $sql = "UPDATE civicrm_uf_field SET field_name = 'participant_role' WHERE " .
+    "field_name = 'participant_role_id' AND uf_group_id IN (SELECT id FROM " .
     "civicrm_uf_group WHERE name = 'update_event_invite_responses') ";
-
   CRM_Core_DAO::executeQuery($sql);
-
 }
diff --git a/modules/civicrm_engage/civicrm_engage.module b/modules/civicrm_engage/civicrm_engage.module
index 5dff3a4..681c860 100644
--- a/modules/civicrm_engage/civicrm_engage.module
+++ b/modules/civicrm_engage/civicrm_engage.module
@@ -23,7 +23,7 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  *
@@ -70,27 +70,26 @@ function civicrm_engage_civicrm_buildForm($formName, &$form) {
 
 function civicrm_engage_civicrm_alterReportVar($varType, &$var, &$form) {
   $formName = get_class($form);
-  if ( $formName == 'CRM_Report_Form_Campaign_SurveyDetails' ) {
-    if ( $varType == 'columns' ) {
-      $var['civicrm_contribution'] =
-        array(
-              'dao' => 'CRM_Contribute_DAO_Contribution',
-              'fields' =>
-              array(
-                    'receive_date' =>
-                    array('title' => ts('Latest Contribution Date'),
-                          ),
-                    'total_amount' =>
-                    array('title' => ts('Latest Contribution Amount'),
-                          ),
-                    ),
-              'grouping' => 'survey-activity-fields',
-              );
-    } else if ( $varType == 'sql' ) {
-      $params = $form->getVar( '_params' );
-      if ( CRM_Utils_Array::value('receive_date', $params['fields']) || CRM_Utils_Array::value('total_amount', $params['fields']) ) {
+  if ($formName == 'CRM_Report_Form_Campaign_SurveyDetails') {
+    if ($varType == 'columns') {
+      $var['civicrm_contribution'] = array(
+        'dao' => 'CRM_Contribute_DAO_Contribution',
+        'fields' => array(
+          'receive_date' => array(
+            'title' => ts('Latest Contribution Date'),
+          ),
+          'total_amount' => array(
+            'title' => ts('Latest Contribution Amount'),
+          ),
+        ),
+        'grouping' => 'survey-activity-fields',
+      );
+    }
+    elseif ($varType == 'sql') {
+      $params = $form->getVar('_params');
+      if (CRM_Utils_Array::value('receive_date', $params['fields']) || CRM_Utils_Array::value('total_amount', $params['fields'])) {
         $var->_from .= "
-LEFT JOIN civicrm_contribution {$form->_aliases['civicrm_contribution']} ON ({$form->_aliases['civicrm_contribution']}.id = (select id from civicrm_contribution con where con.contact_id = {$form->_aliases['civicrm_contact']}.id ORDER BY con.receive_date DESC LIMIT 1 ))\n";
+          LEFT JOIN civicrm_contribution {$form->_aliases['civicrm_contribution']} ON ({$form->_aliases['civicrm_contribution']}.id = (select id from civicrm_contribution con where con.contact_id = {$form->_aliases['civicrm_contact']}.id ORDER BY con.receive_date DESC LIMIT 1 ))\n";
       }
     }
   }
@@ -130,19 +129,19 @@ function civicrm_engage_civicrm_postProcess($class, &$form) {
   }
 }
 
- /** The big picture is:
+/* The big picture is:
  * set our custom demographics group of fields to be a
  * tab; hide the tab; shove the fields into the core
  * Demographics display.
- **/
+ */
 
- /**
+/**
  * Alter the page as displayed on the contact summary
  * and inline demographics. This is the function where we
  * stick the custom demographics fields into the core
  * demographics displayed. It goes with the custom
  * Demographics.tpl file we are shipping.
- **/
+ */
 function civicrm_engage_civicrm_pageRun(&$page) {
   if ($page->getVar('_name') == 'CRM_Contact_Page_View_Summary' ||
     $page->getVar('_name') == 'CRM_Contact_Page_Inline_Demographics') {
@@ -151,7 +150,7 @@ function civicrm_engage_civicrm_pageRun(&$page) {
       return;
     }
     $contactId = $page->getVar('_contactId');
-    if(empty($contactId)) {
+    if (empty($contactId)) {
       $contactId = CRM_Utils_Request::retrieve('cid', 'Positive', $this, TRUE, NULL, $_REQUEST);
     }
     $groupTree = CRM_Core_BAO_CustomGroup::getTree('Individual',
@@ -176,7 +175,7 @@ function civicrm_engage_civicrm_pageRun(&$page) {
  * Hide the custom demographics tab because we are handling
  * the custom demographics fields inline in the
  * civicrm_engage_civicrm_pageRun() function.
- **/
+ */
 function civicrm_engage_civicrm_tabs(&$tabs, $contactID) {
   foreach ($tabs as $tabID => $tabValue) {
     if ($tabValue['title'] == CIVICRM_ENGAGE_DEMOGRAPHICS_TITLE) {
@@ -196,9 +195,7 @@ function civicrm_engage_civicrm_config(&$config) {
   $templateDir = $engageRoot . 'templates' . DIRECTORY_SEPARATOR;
   $template = CRM_Core_Smarty::singleton();
   if (is_array($template->template_dir)) {
-    $template->template_dir = array_merge(array($templateDir),
-      $template->template_dir
-    );
+    $template->template_dir = array_merge(array($templateDir), $template->template_dir);
   }
   else {
     $template->template_dir = array($templateDir, $template->template_dir);
@@ -206,12 +203,12 @@ function civicrm_engage_civicrm_config(&$config) {
 }
 
 /**
- * Implementation of hook_perm().
+ * Implements hook_permission().
  */
 function civicrm_engage_permission() {
   return array(
-    'access civiengage settings' =>
-    array('title' => t('Access CiviCRM engage setting'),
+    'access civiengage settings' => array(
+      'title' => t('Access CiviCRM engage setting'),
       'description' => t('Access CiviCRM engage setting.'),
     ),
   );
@@ -220,16 +217,16 @@ function civicrm_engage_permission() {
 function civicrm_engage_menu() {
 
   $items['admin/config/civicrm/civicrm_engage'] = array(
-    'title' => t('Civicrm engage settings'),
-    'description' => t('CiviCRM Engage Configuration'),
+    'title' => 'Civicrm engage settings',
+    'description' => 'CiviCRM Engage Configuration',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('civicrm_engage_admin_settings'),
     'access arguments' => array('access civiengage settings'),
     'file' => 'civicrm_engage.admin.inc',
   );
   $items['admin/config/civicrm/civicrm_engage/settings'] = array(
-    'title' => t('Civicrm engage settings'),
-    'description' => t('CiviCRM Engage Configuration'),
+    'title' => 'Civicrm engage settings',
+    'description' => 'CiviCRM Engage Configuration',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('civicrm_engage_admin_settings'),
     'access arguments' => array('access civiengage settings'),
@@ -237,8 +234,8 @@ function civicrm_engage_menu() {
     'type' => MENU_DEFAULT_LOCAL_TASK,
   );
   $items['admin/config/civicrm/civicrm_engage/load-data'] = array(
-    'title' => t('Civicrm engage load default data'),
-    'description' => t('CiviCRM Engage Load Data'),
+    'title' => 'Civicrm engage load default data',
+    'description' => 'CiviCRM Engage Load Data',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('civicrm_engage_admin_load_data'),
     'access arguments' => array('access civiengage settings'),
@@ -247,5 +244,3 @@ function civicrm_engage_menu() {
   );
   return $items;
 }
-
-

From c0f4e3ced74c85f54a6417a5195cc0fa758ec8e0 Mon Sep 17 00:00:00 2001
From: Beto Aveiga <luis.aveiga@gmail.com>
Date: Sun, 24 Sep 2017 23:12:14 -0500
Subject: [PATCH 32/86] Need to include fields in order by  in select distinct
 to work

---
 modules/civicrm_member_roles/civicrm_member_roles.module | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/civicrm_member_roles/civicrm_member_roles.module b/modules/civicrm_member_roles/civicrm_member_roles.module
index ff16502..a253a5c 100644
--- a/modules/civicrm_member_roles/civicrm_member_roles.module
+++ b/modules/civicrm_member_roles/civicrm_member_roles.module
@@ -499,7 +499,7 @@ function _civicrm_member_roles_sync($ext_uid = NULL, $cid = NULL, $sync_type = N
       ORDER BY RAND() LIMIT " . $cron_limit;
     }
     else {
-      $sql = "SELECT DISTINCT uf.contact_id FROM civicrm_uf_match uf
+      $sql = "SELECT DISTINCT uf.contact_id, m.end_date FROM civicrm_uf_match uf
       LEFT JOIN civicrm_membership m ON uf.contact_id = m.contact_id
       WHERE m.id IS NOT NULL AND m.membership_type_id IN (" . implode(',', array_keys($memberroles)) . ")
       ORDER BY m.end_date DESC";

From e1b64eee8ddfbe025e1fbf717639c95ab567fcc6 Mon Sep 17 00:00:00 2001
From: olivierh65 <olivierh65@users.noreply.github.com>
Date: Sat, 14 Oct 2017 23:54:20 +0200
Subject: [PATCH 33/86] add missing 's' to variable - CRM-19995

Notice : Undefined offset: 5 dans _civicrm_member_roles_sync() (ligne 587 dans /xxxxxxx/sites/all/modules/civicrm/drupal/modules/civicrm_member_roles/civicrm_member_roles.module).
---
 modules/civicrm_member_roles/civicrm_member_roles.module | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/civicrm_member_roles/civicrm_member_roles.module b/modules/civicrm_member_roles/civicrm_member_roles.module
index a253a5c..b604ab8 100644
--- a/modules/civicrm_member_roles/civicrm_member_roles.module
+++ b/modules/civicrm_member_roles/civicrm_member_roles.module
@@ -576,7 +576,7 @@ function _civicrm_member_roles_sync($ext_uid = NULL, $cid = NULL, $sync_type = N
       }
       foreach ($memberships['values'] as $key => $membership) {
         if (in_array($membership['status_id'], $inactive)) {
-          unset($membership['values'][$key]);
+          unset($memberships['values'][$key]);
         }
       }
     }

From 39a04b5414af98657f411609e5adaf67d88c5f4e Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Sat, 16 Sep 2017 13:10:37 +1000
Subject: [PATCH 34/86] Run civilint against
 civicrm_handler_filter_state_multi.inc

---
 .../civicrm_handler_filter_state_multi.inc    | 64 ++++++++++---------
 1 file changed, 33 insertions(+), 31 deletions(-)

diff --git a/modules/views/civicrm/civicrm_handler_filter_state_multi.inc b/modules/views/civicrm/civicrm_handler_filter_state_multi.inc
index 6601c52..062c263 100644
--- a/modules/views/civicrm/civicrm_handler_filter_state_multi.inc
+++ b/modules/views/civicrm/civicrm_handler_filter_state_multi.inc
@@ -21,22 +21,23 @@
    | GNU Affero General Public License or the licensing of CiviCRM,     |
    | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
    +--------------------------------------------------------------------+
+ */
 
-   **
-   * @file Provides Views integration for CiviCRM Multi-Select Country custom fields
-   *
-   * @author DaveJ
-   * based on civicrm_handler_filter_custom_option and civicrm_handler_filter_state
-   */
+/**
+ * @file Provides Views integration for CiviCRM Multi-Select Country custom fields
+ *
+ * @author DaveJ
+ * based on civicrm_handler_filter_custom_option and civicrm_handler_filter_state
+ */
 class civicrm_handler_filter_state_multi extends views_handler_filter_in_operator {
-  function construct() {
+  public function construct() {
     parent::construct();
     if (!civicrm_initialize()) {
       return;
     }
   }
 
-  function get_value_options() {
+  public function get_value_options() {
     if (!isset($this->value_options)) {
       $states = CRM_Core_PseudoConstant::stateProvince();
       $options = array();
@@ -47,9 +48,8 @@ class civicrm_handler_filter_state_multi extends views_handler_filter_in_operato
       }
       $this->value_options = $options;
     }
-      /*
-     * code to add country->state/province conditional options first determine if there's a country filter on this view if there is, load the country->state options into a JSON object we can attach via javascript. Remove the state options set above and attach the javascript handler
-     */
+
+    //* code to add country->state/province conditional options first determine if there's a country filter on this view if there is, load the country->state options into a JSON object we can attach via javascript. Remove the state options set above and attach the javascript handler
 
     // get the country filter
     $filters = is_array($this->view->filter) ? $this->view->filter : array();
@@ -57,18 +57,17 @@ class civicrm_handler_filter_state_multi extends views_handler_filter_in_operato
       if ($handler->definition['handler'] == 'civicrm_handler_filter_country_multi') {
         $country_field = $handler->field;
         $selected_countries = $loaded_list = array();
-        if(isset($this->view->exposed_input[$country_field])
+        if (isset($this->view->exposed_input[$country_field])
          && count((array) $this->view->exposed_input[$country_field])) {
           $selected_countries = (array) $this->view->exposed_input[$country_field];
         }
         $allowedCountries = array_keys($handler->value_options);
-        if(empty($allowedCountries)) {
+        if (empty($allowedCountries)) {
           $allowedCountries = array_keys(CRM_Core_PseudoConstant::country());
         }
 
         $result = db_query('SELECT id, name, country_id FROM {civicrm_state_province} WHERE country_id IN (:countries)',
-          array(':countries' => $allowedCountries))
-        ->fetchAllAssoc('id');
+          array(':countries' => $allowedCountries))->fetchAllAssoc('id');
 
         $state_html = array();
         foreach ($result as $state_id => $state) {
@@ -76,7 +75,7 @@ class civicrm_handler_filter_state_multi extends views_handler_filter_in_operato
             $state_html[$state->country_id] = '';
           }
           $state_html[$state->country_id] .= '<option value="' . $state_id . '">' . $state->name . '</option>';
-          if(in_array($state->country_id, $selected_countries)) {
+          if (in_array($state->country_id, $selected_countries)) {
             $loaded_list[$state_id] = $state->name;
           }
         }
@@ -89,31 +88,31 @@ class civicrm_handler_filter_state_multi extends views_handler_filter_in_operato
     if (!empty($country_field)) {
       $this->value_options = $loaded_list;
 
-      $fid=md5($country_field);
-      $js = '(function ($) {
-               Drupal.behaviors.civicrm_views_' . $fid . ' = {
+      $fid = md5($country_field);
+      $js = "(function ($) {
+               Drupal.behaviors.civicrm_views_{$fid}= {
                  attach: function (context, settings) {
-                   $("#edit-' . $country_field . '").change( function() {
-                     var stateList = \'<option value="All">&lt;Any&gt;</option>\';
+                   $(" . '"#' . "edit-{$country_field}" . '"' . ").change( function() {
+                     var stateList = \'<option value=" . '"All"' . ">&lt;Any&gt;</option>\';
                      var selectedCountries = $(this).val();
                      // get the string of options
-                     if(jQuery.type(selectedCountries) === "string") {
+                     if(jQuery.type(selectedCountries) === " . '"string"' . ") {
                        selectedCountries = [selectedCountries];
                      }
                      $.each(selectedCountries, function(index, selectedCountry) {
                        stateList = stateList + ((Drupal.settings.civicrm_views.states[selectedCountry])? Drupal.settings.civicrm_views.states[selectedCountry] : \'\');
                      });
-                     $("select[name=' . $this->field . ']").empty();
-                     $("select[name=' . $this->field . ']").html(stateList);
+                     $(" . '"' . "select[name={$this->field}]" . '"' . ").empty();
+                     $(" . '"' . "select[name={$this->field}]" . '"' . ").html(stateList);
                    });
                  }
                }
-             })(jQuery); ';
+             })(jQuery); ";
       drupal_add_js($js, 'inline', 'footer');
     } // end if country filter
   }
 
-  function operators() {
+  public function operators() {
     $operators = parent::operators();
     $operators += array(
       'all' => array(
@@ -121,13 +120,13 @@ class civicrm_handler_filter_state_multi extends views_handler_filter_in_operato
         'short' => t('all'),
         'method' => 'op_simple',
         'values' => 1,
-        ),
-      );
+      ),
+    );
 
     return $operators;
   }
 
-  function op_simple() {
+  public function op_simple() {
     if (empty($this->value)) {
       return;
     }
@@ -135,17 +134,19 @@ class civicrm_handler_filter_state_multi extends views_handler_filter_in_operato
     $this->ensure_my_table();
 
     // negated operator uses AND, positive uses OR
-    $op = $glue = null;
+    $op = $glue = NULL;
     switch ($this->operator) {
       case 'in':
         $op = ' = ';
         $glue = ' OR ';
         break;
+
       case 'not in':
         $op = ' != ';
         $glue = ' AND ';
         break;
-      case 'all' :
+
+      case 'all':
         $clause = "$this->table_alias.$this->real_field IN (" . implode(',', $this->value) . ")";
         break;
     }
@@ -159,4 +160,5 @@ class civicrm_handler_filter_state_multi extends views_handler_filter_in_operato
 
     $this->query->add_where_expression($this->options['group'], $clause);
   }
+
 }

From 6e9ad2a71ee2be2655b6b84ac6dbbdd8dca28302 Mon Sep 17 00:00:00 2001
From: colemanw <coleman@civicrm.org>
Date: Sun, 29 Oct 2017 21:41:57 -0400
Subject: [PATCH 35/86] Cleanup comments and js

---
 .../civicrm_handler_filter_state_multi.inc    | 21 +++++++++----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/modules/views/civicrm/civicrm_handler_filter_state_multi.inc b/modules/views/civicrm/civicrm_handler_filter_state_multi.inc
index 062c263..2d78c3f 100644
--- a/modules/views/civicrm/civicrm_handler_filter_state_multi.inc
+++ b/modules/views/civicrm/civicrm_handler_filter_state_multi.inc
@@ -82,7 +82,7 @@ class civicrm_handler_filter_state_multi extends views_handler_filter_in_operato
         drupal_add_js(array('civicrm_views' => array('states' => $state_html)), 'setting');
         $c_object = json_encode($state_html);
       }
-    } // end foreach
+    }
 
     // country filter exists, remove options, add js
     if (!empty($country_field)) {
@@ -90,26 +90,25 @@ class civicrm_handler_filter_state_multi extends views_handler_filter_in_operato
 
       $fid = md5($country_field);
       $js = "(function ($) {
-               Drupal.behaviors.civicrm_views_{$fid}= {
+               Drupal.behaviors.civicrm_views_{$fid} = {
                  attach: function (context, settings) {
-                   $(" . '"#' . "edit-{$country_field}" . '"' . ").change( function() {
-                     var stateList = \'<option value=" . '"All"' . ">&lt;Any&gt;</option>\';
+                   $('#edit-{$country_field}').change(function() {
+                     var stateList = '<option value=\"All\">&lt;Any&gt;</option>';
                      var selectedCountries = $(this).val();
-                     // get the string of options
-                     if(jQuery.type(selectedCountries) === " . '"string"' . ") {
+                     // ensure selectedCountries is an array
+                     if ($.type(selectedCountries) === 'string') {
                        selectedCountries = [selectedCountries];
                      }
                      $.each(selectedCountries, function(index, selectedCountry) {
-                       stateList = stateList + ((Drupal.settings.civicrm_views.states[selectedCountry])? Drupal.settings.civicrm_views.states[selectedCountry] : \'\');
+                       stateList = stateList + (Drupal.settings.civicrm_views.states[selectedCountry] || '');
                      });
-                     $(" . '"' . "select[name={$this->field}]" . '"' . ").empty();
-                     $(" . '"' . "select[name={$this->field}]" . '"' . ").html(stateList);
+                     $('select[name={$this->field}]').empty().html(stateList);
                    });
                  }
                }
-             })(jQuery); ";
+             })(jQuery);";
       drupal_add_js($js, 'inline', 'footer');
-    } // end if country filter
+    }
   }
 
   public function operators() {

From 801b2a8e4ca73f06b240575a9e83465f5998969d Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Tue, 31 Oct 2017 14:54:46 +1300
Subject: [PATCH 36/86] CRM-21371 - An api error when calling drush cvapi
 should be treated as a drush error

Also defines a used var and removes legacy svn id refs
---
 drush/civicrm.drush.inc | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/drush/civicrm.drush.inc b/drush/civicrm.drush.inc
index adbf2ba..314f0e4 100644
--- a/drush/civicrm.drush.inc
+++ b/drush/civicrm.drush.inc
@@ -29,13 +29,8 @@
  *
  * @package CRM
  * @copyright CiviCRM LLC (c) 2004-2017
- * $Id$
- *
  */
 
-// $Id: example.drush.inc,v 1.5 2009/09/30 13:15:54 weitzman Exp $
-
-
 /**
  * @file
  *   Example drush command.
@@ -1524,7 +1519,8 @@ function drush_civicrm_api() {
   array_shift($args);
 
   // Parse $params
-  switch (drush_get_option('in', 'args')) {
+  $format = drush_get_option('in', 'args');
+  switch ($format) {
     case 'args':
       $params = $DEFAULTS;
       foreach ($args as $arg) {
@@ -1556,8 +1552,12 @@ function drush_civicrm_api() {
   );
 
   $result = civicrm_api($entity, $action, $params);
+  if (!empty($result['is_error'])) {
+    drush_set_error('CIVICRM api error', $result['error_message']);
+  }
 
-  switch (drush_get_option('out', 'pretty')) {
+  $format = drush_get_option('out', 'pretty');
+  switch ($format) {
     case 'pretty':
       drush_print_r($result);
       break;

From 1631c580d3755ceb283b4794682871fd7ced8e29 Mon Sep 17 00:00:00 2001
From: Jitendra Purohit <jitendra@fuzion.co.nz>
Date: Wed, 28 Jun 2017 20:05:52 +0530
Subject: [PATCH 37/86] CRM-20783 : Get currency from civi if not included in
 view fields

---
 modules/views/civicrm/civicrm_handler_field_money.inc | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/modules/views/civicrm/civicrm_handler_field_money.inc b/modules/views/civicrm/civicrm_handler_field_money.inc
index a5a7e75..715135f 100644
--- a/modules/views/civicrm/civicrm_handler_field_money.inc
+++ b/modules/views/civicrm/civicrm_handler_field_money.inc
@@ -43,7 +43,12 @@ class civicrm_handler_field_money extends views_handler_field {
 
   public function render($values) {
     $value = $this->get_value($values);
-    $currency = $this->get_value($values, 'currency');
+    if (!empty($this->definition['currency field'])) {
+      $currency = $this->get_value($values, 'currency');
+    }
+    else {
+      $currency = CRM_Core_Config::singleton()->defaultCurrency;
+    }
 
     switch ($this->options['display_format']) {
       case 'formatted':

From 57a37e46a23a941bb8fbb7206f7c173ecfa9bac7 Mon Sep 17 00:00:00 2001
From: Jitendra Purohit <jitendra@fuzion.co.nz>
Date: Tue, 21 Nov 2017 14:39:44 +0530
Subject: [PATCH 38/86] CRM-20734: Populate state if country is selected by
 default on page load

---
 .../civicrm_handler_filter_state_multi.inc       | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/modules/views/civicrm/civicrm_handler_filter_state_multi.inc b/modules/views/civicrm/civicrm_handler_filter_state_multi.inc
index 2d78c3f..cd1ed74 100644
--- a/modules/views/civicrm/civicrm_handler_filter_state_multi.inc
+++ b/modules/views/civicrm/civicrm_handler_filter_state_multi.inc
@@ -53,6 +53,7 @@ class civicrm_handler_filter_state_multi extends views_handler_filter_in_operato
 
     // get the country filter
     $filters = is_array($this->view->filter) ? $this->view->filter : array();
+    $state = '';
     foreach ($filters as $name => $handler) {
       if ($handler->definition['handler'] == 'civicrm_handler_filter_country_multi') {
         $country_field = $handler->field;
@@ -82,6 +83,9 @@ class civicrm_handler_filter_state_multi extends views_handler_filter_in_operato
         drupal_add_js(array('civicrm_views' => array('states' => $state_html)), 'setting');
         $c_object = json_encode($state_html);
       }
+      if ($handler->definition['handler'] == 'civicrm_handler_filter_state_multi') {
+        $state = CRM_Utils_Array::value($handler->field, $_GET);
+      }
     }
 
     // country filter exists, remove options, add js
@@ -92,9 +96,13 @@ class civicrm_handler_filter_state_multi extends views_handler_filter_in_operato
       $js = "(function ($) {
                Drupal.behaviors.civicrm_views_{$fid} = {
                  attach: function (context, settings) {
-                   $('#edit-{$country_field}').change(function() {
+                   if ($('#edit-{$country_field}').val() && !settings.state) {
+                      load_state();
+                   }
+                   function load_state() {
+                     var country = $('#edit-{$country_field}');
                      var stateList = '<option value=\"All\">&lt;Any&gt;</option>';
-                     var selectedCountries = $(this).val();
+                     var selectedCountries = country.val();
                      // ensure selectedCountries is an array
                      if ($.type(selectedCountries) === 'string') {
                        selectedCountries = [selectedCountries];
@@ -103,11 +111,13 @@ class civicrm_handler_filter_state_multi extends views_handler_filter_in_operato
                        stateList = stateList + (Drupal.settings.civicrm_views.states[selectedCountry] || '');
                      });
                      $('select[name={$this->field}]').empty().html(stateList);
-                   });
+                   }
+                   $('#edit-{$country_field}').change(load_state);
                  }
                }
              })(jQuery);";
       drupal_add_js($js, 'inline', 'footer');
+      drupal_add_js(array('state' => $state), 'setting');
     }
   }
 

From 959c03875a741ada50e5445b89fa13217afc326b Mon Sep 17 00:00:00 2001
From: Jitendra Purohit <jitendra@fuzion.co.nz>
Date: Tue, 2 Jan 2018 12:31:27 +0530
Subject: [PATCH 39/86] CRM-21226: Add view filter handler for contact
 reference custom field

---
 civicrm.info                                  |  1 +
 modules/views/civicrm.views.inc               |  3 +
 .../civicrm_handler_filter_contact_ref.inc    | 64 +++++++++++++++++++
 3 files changed, 68 insertions(+)
 create mode 100644 modules/views/civicrm/civicrm_handler_filter_contact_ref.inc

diff --git a/civicrm.info b/civicrm.info
index 93dbd93..38862f5 100644
--- a/civicrm.info
+++ b/civicrm.info
@@ -66,6 +66,7 @@ files[] = modules/views/civicrm/civicrm_handler_filter_relationship_type.inc
 files[] = modules/views/civicrm/civicrm_handler_filter_country_multi.inc
 files[] = modules/views/civicrm/civicrm_handler_filter_state_multi.inc
 files[] = modules/views/civicrm/civicrm_handler_filter_domain.inc
+files[] = modules/views/civicrm/civicrm_handler_filter_contact_ref.inc
 
 ; activity handlers
 files[] = modules/views/civicrm/civicrm_handler_field_activity.inc
diff --git a/modules/views/civicrm.views.inc b/modules/views/civicrm.views.inc
index 31f8031..53799ab 100644
--- a/modules/views/civicrm.views.inc
+++ b/modules/views/civicrm.views.inc
@@ -611,6 +611,9 @@ function civicrm_views_get_filter($data_type, $html_type = NULL, $option_group_i
     case "County":
       return array('handler' => 'civicrm_handler_filter_pseudo_constant', 'pseudo class' => 'CRM_Core_PseudoConstant', 'pseudo method' => 'county', 'allow empty' => TRUE);
 
+    case "ContactReference":
+      return array('handler' => 'civicrm_handler_filter_contact_ref');
+
     default:
       return array('handler' => 'views_handler_filter_string', 'allow empty' => TRUE);
   }
diff --git a/modules/views/civicrm/civicrm_handler_filter_contact_ref.inc b/modules/views/civicrm/civicrm_handler_filter_contact_ref.inc
new file mode 100644
index 0000000..3eb8964
--- /dev/null
+++ b/modules/views/civicrm/civicrm_handler_filter_contact_ref.inc
@@ -0,0 +1,64 @@
+<?php
+/*
+ +--------------------------------------------------------------------+
+ | CiviCRM version 4.7                                                |
+ +--------------------------------------------------------------------+
+ | 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        |
+ +--------------------------------------------------------------------+
+ */
+
+/**
+ * Filters Contact reference custom field.
+ */
+class civicrm_handler_filter_contact_ref extends views_handler_filter_string {
+  public function construct() {
+    parent::construct();
+    if (!civicrm_initialize()) {
+      return;
+    }
+  }
+  public function op_equal($field) {
+    $this->filterContactRef($field);
+  }
+  public function op_contains($field) {
+    $this->filterContactRef($field);
+  }
+
+  /**
+   * Adds where clause to the view query to filter
+   * by contact sort_name instead of id.
+   *
+   * @param string $field
+   */
+  public function filterContactRef($field) {
+    if (!empty($this->value)) {
+      $op = $this->operator;
+      if ($this->operator != '=' && $this->operator != '!=') {
+        $op = 'LIKE';
+        $this->value = "%{$this->value}%";
+      }
+      $contacts = db_select('civicrm_contact', 'cc')
+        ->fields('cc', array('id'))
+        ->condition('cc.sort_name', $this->value, $op);
+
+      $this->query->add_where($this->options['group'], $field, $contacts, 'IN');
+    }
+  }
+
+}

From 6c718b104faf64a72900d5c99ec66cb9e612faf0 Mon Sep 17 00:00:00 2001
From: yurg <yurg@users.noreply.github.com>
Date: Mon, 5 Feb 2018 10:34:59 +0100
Subject: [PATCH 40/86] Update civicrm_handler_field_contact_image.inc

Gives "Notice: Undefined index: image_style in civicrm_handler_field_contact_image->render() (line 130 of sites\all\modules\civicrm\drupal\modules\views\civicrm\civicrm_handler_field_contact_image.inc)." if "Custom Files Directory" at civicrm/admin/setting/path?reset=1 doesn't contain "[civicrm.files]" ( in my case default directory has been set as "custom/"  only; changing it to be [civicrm.files]/custom has got Drupal image styles back for CiviCRM Contact Image field in Views )
---
 modules/views/civicrm/civicrm_handler_field_contact_image.inc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/views/civicrm/civicrm_handler_field_contact_image.inc b/modules/views/civicrm/civicrm_handler_field_contact_image.inc
index 8315bef..1bd77b3 100644
--- a/modules/views/civicrm/civicrm_handler_field_contact_image.inc
+++ b/modules/views/civicrm/civicrm_handler_field_contact_image.inc
@@ -86,6 +86,7 @@ class civicrm_handler_field_contact_image extends views_handler_field {
       '#dependency' => array(
         'edit-options-url-only' => array(0),
       ),
+            '#prefix' => t('If you do not see Drupal image styles here, it may be worth checking CiviCRM "Custom files directory" <br> at <strong>"CiviCRM > Administer > System Settings > Directories" </strong> : it <strong>has to </strong> contain <italic>[civicrm.files]</italic> token'), 
     );
 
     $form['height'] = array(

From f951265d98f4b30dc8fc624e152060dc2c7455bc Mon Sep 17 00:00:00 2001
From: Jon Goldberg <jon@megaphonetech.com>
Date: Fri, 9 Feb 2018 16:07:25 -0500
Subject: [PATCH 41/86] Add created_id to Views integration

---
 modules/views/components/civicrm.event.inc | 25 ++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/modules/views/components/civicrm.event.inc b/modules/views/components/civicrm.event.inc
index 4b0e360..3be2577 100644
--- a/modules/views/components/civicrm.event.inc
+++ b/modules/views/components/civicrm.event.inc
@@ -343,6 +343,31 @@ function _civicrm_event_data(&$data, $enabled) {
       'handler' => 'views_handler_sort',
     ),
   );
+  // Event created_id
+  $data['civicrm_event']['created_id'] = array(
+    'title' => t('Created ID'),
+    'help' => t("Contact ID of the event's creator"),
+    'field' => array(
+      'handler' => 'civicrm_handler_field_event_link',
+      'click sortable' => TRUE,
+    ),
+    'argument' => array(
+      'handler' => 'views_handler_argument_numeric',
+    ),
+    'filter' => array(
+      'handler' => 'views_handler_filter_numeric',
+      'allow empty' => TRUE,
+    ),
+    'sort' => array(
+      'handler' => 'views_handler_sort',
+    ),
+    'relationship' => array(
+      'base' => 'civicrm_contact',
+      'field' => 'created_id',
+      'handler' => 'views_handler_relationship',
+      'label' => t('CiviCRM Contact of the event creator'),
+    ),
+  );
   // Link to Campaign Table
   if (isset($enabled['CiviCampaign'])) {
     $data['civicrm_event']['campaign_id'] = array(

From 9ba43b4a7512e89463a17e8898e7e05cb69f333c Mon Sep 17 00:00:00 2001
From: Herb vd Dool <herb@freeform.ca>
Date: Fri, 9 Feb 2018 21:38:09 -0500
Subject: [PATCH 42/86] crm-16541 Allow extra options to be passed to
 mysqldump. Include --routines by default.

---
 drush/civicrm.drush.inc | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drush/civicrm.drush.inc b/drush/civicrm.drush.inc
index 314f0e4..6c611da 100644
--- a/drush/civicrm.drush.inc
+++ b/drush/civicrm.drush.inc
@@ -194,12 +194,14 @@ function civicrm_drush_command() {
     'description' => 'Exports the CiviCRM DB as SQL using mysqldump.',
     'examples' => array(
       'drush civicrm-sql-dump --result-file=../CiviCRM.sql' => 'Save SQL dump to the directory above Drupal root.',
+      'drush civicrm-sql-dump --extra-options=--quick' => 'Pass the --quick option to mysqldump to help with large tables.',
     ),
     'options' => array(
       'data-only' => 'Dump data without statements to create any of the schema.',
       'gzip' => 'Compress the dump using the gzip program which must be in your $PATH.',
       'result-file' => 'Save to a file.',
       'tables-list' => 'comma-separated list of tables to transfer.',
+      'extra-options' => 'Add custom options to the dump command.',
     ),
   );
   $items['civicrm-sql-query'] = array(
@@ -1177,6 +1179,8 @@ function drush_civicrm_pre_civicrm_sqldump() {
  * Implementation of command 'civicrm-sql-dump'
  */
 function drush_civicrm_sqldump() {
+  $extra_options = drush_get_option('extra-options', '');
+  drush_set_option('extra', '--routines ' . $extra_options);
   if (version_compare(DRUSH_VERSION, 7, '>=')) {
     drush_sql_dump();
   }

From f5af960c893a40ca1e6705e63d8165d15c15c1cc Mon Sep 17 00:00:00 2001
From: yashodha <yashodha@cividesk.com>
Date: Mon, 26 Feb 2018 10:25:33 +0530
Subject: [PATCH 43/86] header fixes

---
 civicrm.install                                               | 4 ++--
 civicrm.module                                                | 2 +-
 drush/civicrm.drush.inc                                       | 4 ++--
 modules/civicrm_engage/Engage/Report/Form/CallList.php        | 4 ++--
 modules/civicrm_engage/Engage/Report/Form/List.php            | 4 ++--
 modules/civicrm_engage/Engage/Report/Form/WalkList.php        | 4 ++--
 modules/civicrm_engage/civicrm_engage.install                 | 4 ++--
 modules/civicrm_engage/civicrm_engage.module                  | 4 ++--
 .../templates/CRM/Contact/Form/Edit/Demographics.tpl          | 2 +-
 .../templates/CRM/Contact/Form/Inline/Demographics.tpl        | 2 +-
 .../templates/CRM/Contact/Page/Inline/Demographics.tpl        | 2 +-
 modules/civicrm_og_sync/civicrm_og_sync.install               | 4 ++--
 modules/civicrm_og_sync/civicrm_og_sync.module                | 4 ++--
 modules/civicrm_rules/civicrm_rules.contact-eval.inc          | 4 ++--
 modules/civicrm_rules/civicrm_rules.event-eval.inc            | 4 ++--
 modules/civicrm_rules/civicrm_rules.install                   | 4 ++--
 modules/civicrm_rules/civicrm_rules.mailing-eval.inc          | 4 ++--
 modules/civicrm_rules/civicrm_rules.module                    | 4 ++--
 modules/civicrm_rules/civicrm_rules.participant-eval.inc      | 4 ++--
 modules/civicrm_rules/civicrm_rules.rules.inc                 | 4 ++--
 modules/civicrm_rules/civicrm_rules_action.inc                | 4 ++--
 modules/civicrm_rules/civicrm_rules_condition.inc             | 4 ++--
 modules/civicrm_rules/civicrm_rules_entity.inc                | 4 ++--
 modules/civicrm_rules/civicrm_rules_event.inc                 | 4 ++--
 modules/civicrm_rules/civicrm_rules_utils.inc                 | 4 ++--
 modules/civicrmtheme/civicrmtheme.install                     | 4 ++--
 modules/civicrmtheme/civicrmtheme.module                      | 4 ++--
 27 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/civicrm.install b/civicrm.install
index 7e38031..d0ca24d 100644
--- a/civicrm.install
+++ b/civicrm.install
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 4.7                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2017                                |
+ | Copyright CiviCRM LLC (c) 2004-2018                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2017
+ * @copyright CiviCRM LLC (c) 2004-2018
  * $Id$
  *
  */
diff --git a/civicrm.module b/civicrm.module
index e5eebf6..b25d54d 100644
--- a/civicrm.module
+++ b/civicrm.module
@@ -26,7 +26,7 @@
  * Drupal module file.
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2017
+ * @copyright CiviCRM LLC (c) 2004-2018
  */
 require_once 'civicrm_user.inc';
 
diff --git a/drush/civicrm.drush.inc b/drush/civicrm.drush.inc
index 6c611da..e4edf4a 100644
--- a/drush/civicrm.drush.inc
+++ b/drush/civicrm.drush.inc
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 4.7                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2017                                |
+ | Copyright CiviCRM LLC (c) 2004-2018                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2017
+ * @copyright CiviCRM LLC (c) 2004-2018
  */
 
 /**
diff --git a/modules/civicrm_engage/Engage/Report/Form/CallList.php b/modules/civicrm_engage/Engage/Report/Form/CallList.php
index 3446120..73e5469 100644
--- a/modules/civicrm_engage/Engage/Report/Form/CallList.php
+++ b/modules/civicrm_engage/Engage/Report/Form/CallList.php
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 4.7                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2017                                |
+ | Copyright CiviCRM LLC (c) 2004-2018                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2017
+ * @copyright CiviCRM LLC (c) 2004-2018
  * @copyright DharmaTech  (c) 2009
  * $Id$
  *
diff --git a/modules/civicrm_engage/Engage/Report/Form/List.php b/modules/civicrm_engage/Engage/Report/Form/List.php
index 73816d1..e64b181 100644
--- a/modules/civicrm_engage/Engage/Report/Form/List.php
+++ b/modules/civicrm_engage/Engage/Report/Form/List.php
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 4.7                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2017                                |
+ | Copyright CiviCRM LLC (c) 2004-2018                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2017
+ * @copyright CiviCRM LLC (c) 2004-2018
  * @copyright DharmaTech  (c) 2009
  * $Id$
  *
diff --git a/modules/civicrm_engage/Engage/Report/Form/WalkList.php b/modules/civicrm_engage/Engage/Report/Form/WalkList.php
index 20c39eb..386e567 100644
--- a/modules/civicrm_engage/Engage/Report/Form/WalkList.php
+++ b/modules/civicrm_engage/Engage/Report/Form/WalkList.php
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 4.7                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2017                                |
+ | Copyright CiviCRM LLC (c) 2004-2018                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2017
+ * @copyright CiviCRM LLC (c) 2004-2018
  * @copyright DharmaTech  (c) 2009
  * $Id$
  *
diff --git a/modules/civicrm_engage/civicrm_engage.install b/modules/civicrm_engage/civicrm_engage.install
index 9e942ea..3d406a6 100644
--- a/modules/civicrm_engage/civicrm_engage.install
+++ b/modules/civicrm_engage/civicrm_engage.install
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 4.7                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2017                                |
+ | Copyright CiviCRM LLC (c) 2004-2018                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2017
+ * @copyright CiviCRM LLC (c) 2004-2018
  * $Id$
  *
  */
diff --git a/modules/civicrm_engage/civicrm_engage.module b/modules/civicrm_engage/civicrm_engage.module
index 681c860..24ec592 100644
--- a/modules/civicrm_engage/civicrm_engage.module
+++ b/modules/civicrm_engage/civicrm_engage.module
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 4.7                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2017                                |
+ | Copyright CiviCRM LLC (c) 2004-2018                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2017
+ * @copyright CiviCRM LLC (c) 2004-2018
  * $Id$
  *
  */
diff --git a/modules/civicrm_engage/templates/CRM/Contact/Form/Edit/Demographics.tpl b/modules/civicrm_engage/templates/CRM/Contact/Form/Edit/Demographics.tpl
index d8f5898..7779ce5 100644
--- a/modules/civicrm_engage/templates/CRM/Contact/Form/Edit/Demographics.tpl
+++ b/modules/civicrm_engage/templates/CRM/Contact/Form/Edit/Demographics.tpl
@@ -2,7 +2,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 4.7                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2017                                |
+ | Copyright CiviCRM LLC (c) 2004-2018                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
diff --git a/modules/civicrm_engage/templates/CRM/Contact/Form/Inline/Demographics.tpl b/modules/civicrm_engage/templates/CRM/Contact/Form/Inline/Demographics.tpl
index 33a2a1b..97c923a 100644
--- a/modules/civicrm_engage/templates/CRM/Contact/Form/Inline/Demographics.tpl
+++ b/modules/civicrm_engage/templates/CRM/Contact/Form/Inline/Demographics.tpl
@@ -2,7 +2,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 4.7                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2017                                |
+ | Copyright CiviCRM LLC (c) 2004-2018                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
diff --git a/modules/civicrm_engage/templates/CRM/Contact/Page/Inline/Demographics.tpl b/modules/civicrm_engage/templates/CRM/Contact/Page/Inline/Demographics.tpl
index 11477bc..5533aa0 100644
--- a/modules/civicrm_engage/templates/CRM/Contact/Page/Inline/Demographics.tpl
+++ b/modules/civicrm_engage/templates/CRM/Contact/Page/Inline/Demographics.tpl
@@ -2,7 +2,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 4.7                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2017                                |
+ | Copyright CiviCRM LLC (c) 2004-2018                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
diff --git a/modules/civicrm_og_sync/civicrm_og_sync.install b/modules/civicrm_og_sync/civicrm_og_sync.install
index e820de9..82ea161 100644
--- a/modules/civicrm_og_sync/civicrm_og_sync.install
+++ b/modules/civicrm_og_sync/civicrm_og_sync.install
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 4.7                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2017                                |
+ | Copyright CiviCRM LLC (c) 2004-2018                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2017
+ * @copyright CiviCRM LLC (c) 2004-2018
  * $Id$
  *
  */
diff --git a/modules/civicrm_og_sync/civicrm_og_sync.module b/modules/civicrm_og_sync/civicrm_og_sync.module
index 61a6e81..a000039 100644
--- a/modules/civicrm_og_sync/civicrm_og_sync.module
+++ b/modules/civicrm_og_sync/civicrm_og_sync.module
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 4.7                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2017                                |
+ | Copyright CiviCRM LLC (c) 2004-2018                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2017
+ * @copyright CiviCRM LLC (c) 2004-2018
  * $Id$
  *
  */
diff --git a/modules/civicrm_rules/civicrm_rules.contact-eval.inc b/modules/civicrm_rules/civicrm_rules.contact-eval.inc
index fdf2d02..6ddac49 100644
--- a/modules/civicrm_rules/civicrm_rules.contact-eval.inc
+++ b/modules/civicrm_rules/civicrm_rules.contact-eval.inc
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 4.7                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2017                                |
+ | Copyright CiviCRM LLC (c) 2004-2018                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2017
+ * @copyright CiviCRM LLC (c) 2004-2018
  * $Id$
  *
  */
diff --git a/modules/civicrm_rules/civicrm_rules.event-eval.inc b/modules/civicrm_rules/civicrm_rules.event-eval.inc
index 461a101..cc20d07 100644
--- a/modules/civicrm_rules/civicrm_rules.event-eval.inc
+++ b/modules/civicrm_rules/civicrm_rules.event-eval.inc
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 4.7                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2017                                |
+ | Copyright CiviCRM LLC (c) 2004-2018                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2017
+ * @copyright CiviCRM LLC (c) 2004-2018
  * $Id$
  *
  */
diff --git a/modules/civicrm_rules/civicrm_rules.install b/modules/civicrm_rules/civicrm_rules.install
index 77396f9..f359ddf 100644
--- a/modules/civicrm_rules/civicrm_rules.install
+++ b/modules/civicrm_rules/civicrm_rules.install
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 4.7                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2017                                |
+ | Copyright CiviCRM LLC (c) 2004-2018                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2017
+ * @copyright CiviCRM LLC (c) 2004-2018
  * $Id$
  *
  */
diff --git a/modules/civicrm_rules/civicrm_rules.mailing-eval.inc b/modules/civicrm_rules/civicrm_rules.mailing-eval.inc
index e142cf8..0e198c1 100644
--- a/modules/civicrm_rules/civicrm_rules.mailing-eval.inc
+++ b/modules/civicrm_rules/civicrm_rules.mailing-eval.inc
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 4.7                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2017                                |
+ | Copyright CiviCRM LLC (c) 2004-2018                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2017
+ * @copyright CiviCRM LLC (c) 2004-2018
  * $Id$
  *
  */
diff --git a/modules/civicrm_rules/civicrm_rules.module b/modules/civicrm_rules/civicrm_rules.module
index 2c5c346..40be85c 100644
--- a/modules/civicrm_rules/civicrm_rules.module
+++ b/modules/civicrm_rules/civicrm_rules.module
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 4.7                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2017                                |
+ | Copyright CiviCRM LLC (c) 2004-2018                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2017
+ * @copyright CiviCRM LLC (c) 2004-2018
  * $Id$
  *
  */
diff --git a/modules/civicrm_rules/civicrm_rules.participant-eval.inc b/modules/civicrm_rules/civicrm_rules.participant-eval.inc
index c78df63..640a4ab 100644
--- a/modules/civicrm_rules/civicrm_rules.participant-eval.inc
+++ b/modules/civicrm_rules/civicrm_rules.participant-eval.inc
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 4.7                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2017                                |
+ | Copyright CiviCRM LLC (c) 2004-2018                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2017
+ * @copyright CiviCRM LLC (c) 2004-2018
  * $Id$
  *
  */
diff --git a/modules/civicrm_rules/civicrm_rules.rules.inc b/modules/civicrm_rules/civicrm_rules.rules.inc
index 190d9f3..a9efe1a 100644
--- a/modules/civicrm_rules/civicrm_rules.rules.inc
+++ b/modules/civicrm_rules/civicrm_rules.rules.inc
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 4.7                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2017                                |
+ | Copyright CiviCRM LLC (c) 2004-2018                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2017
+ * @copyright CiviCRM LLC (c) 2004-2018
  * $Id$
  *
  */
diff --git a/modules/civicrm_rules/civicrm_rules_action.inc b/modules/civicrm_rules/civicrm_rules_action.inc
index f719074..9ab48e2 100644
--- a/modules/civicrm_rules/civicrm_rules_action.inc
+++ b/modules/civicrm_rules/civicrm_rules_action.inc
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 4.7                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2017                                |
+ | Copyright CiviCRM LLC (c) 2004-2018                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2017
+ * @copyright CiviCRM LLC (c) 2004-2018
  * $Id$
  *
  */
diff --git a/modules/civicrm_rules/civicrm_rules_condition.inc b/modules/civicrm_rules/civicrm_rules_condition.inc
index 543053b..99e9538 100644
--- a/modules/civicrm_rules/civicrm_rules_condition.inc
+++ b/modules/civicrm_rules/civicrm_rules_condition.inc
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 4.7                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2017                                |
+ | Copyright CiviCRM LLC (c) 2004-2018                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2017
+ * @copyright CiviCRM LLC (c) 2004-2018
  * $Id$
  *
  */
diff --git a/modules/civicrm_rules/civicrm_rules_entity.inc b/modules/civicrm_rules/civicrm_rules_entity.inc
index 23b9033..4a598d8 100644
--- a/modules/civicrm_rules/civicrm_rules_entity.inc
+++ b/modules/civicrm_rules/civicrm_rules_entity.inc
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 4.7                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2017                                |
+ | Copyright CiviCRM LLC (c) 2004-2018                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2017
+ * @copyright CiviCRM LLC (c) 2004-2018
  * $Id$
  *
  */
diff --git a/modules/civicrm_rules/civicrm_rules_event.inc b/modules/civicrm_rules/civicrm_rules_event.inc
index 33a3c5a..ee901f9 100644
--- a/modules/civicrm_rules/civicrm_rules_event.inc
+++ b/modules/civicrm_rules/civicrm_rules_event.inc
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 4.7                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2017                                |
+ | Copyright CiviCRM LLC (c) 2004-2018                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2017
+ * @copyright CiviCRM LLC (c) 2004-2018
  * $Id$
  *
  */
diff --git a/modules/civicrm_rules/civicrm_rules_utils.inc b/modules/civicrm_rules/civicrm_rules_utils.inc
index e5135a3..d66d5ce 100644
--- a/modules/civicrm_rules/civicrm_rules_utils.inc
+++ b/modules/civicrm_rules/civicrm_rules_utils.inc
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 4.7                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2017                                |
+ | Copyright CiviCRM LLC (c) 2004-2018                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2017
+ * @copyright CiviCRM LLC (c) 2004-2018
  * $Id$
  *
  */
diff --git a/modules/civicrmtheme/civicrmtheme.install b/modules/civicrmtheme/civicrmtheme.install
index 2f8acac..efe6a33 100644
--- a/modules/civicrmtheme/civicrmtheme.install
+++ b/modules/civicrmtheme/civicrmtheme.install
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 4.7                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2017                                |
+ | Copyright CiviCRM LLC (c) 2004-2018                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2017
+ * @copyright CiviCRM LLC (c) 2004-2018
  * $Id$
  *
  */
diff --git a/modules/civicrmtheme/civicrmtheme.module b/modules/civicrmtheme/civicrmtheme.module
index 9a5b9b0..d34b5f7 100644
--- a/modules/civicrmtheme/civicrmtheme.module
+++ b/modules/civicrmtheme/civicrmtheme.module
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 4.7                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2017                                |
+ | Copyright CiviCRM LLC (c) 2004-2018                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2017
+ * @copyright CiviCRM LLC (c) 2004-2018
  * $Id$
  *
  */

From d290be969d977006274e8ab2d5ce119ef20d6ca1 Mon Sep 17 00:00:00 2001
From: Matthew Wire <devel@mrwire.co.uk>
Date: Mon, 19 Mar 2018 16:29:40 +0000
Subject: [PATCH 44/86] Add activity created_date, modified_date and
 original_id fields to views

---
 modules/views/components/civicrm.core.inc | 63 +++++++++++++++++++++++
 1 file changed, 63 insertions(+)

diff --git a/modules/views/components/civicrm.core.inc b/modules/views/components/civicrm.core.inc
index 8ec4dad..7ddfb0f 100644
--- a/modules/views/components/civicrm.core.inc
+++ b/modules/views/components/civicrm.core.inc
@@ -2045,6 +2045,27 @@ function _civicrm_core_data(&$data, $enabled) {
     ),
   );
 
+  // Original ID
+  $data['civicrm_activity']['original_id'] = array(
+    'title' => t('Original Activity ID'),
+    'help' => t('The numeric ID of the Original Activity in a versioned chain.'),
+    'field' => array(
+      'handler' => 'views_handler_field_numeric',
+      'click sortable' => TRUE,
+    ),
+    'argument' => array(
+      'handler' => 'views_handler_argument_numeric',
+      'numeric' => TRUE,
+    ),
+    'filter' => array(
+      'handler' => 'views_handler_filter_numeric',
+      'allow empty' => TRUE,
+    ),
+    'sort' => array(
+      'handler' => 'views_handler_sort',
+    ),
+  );
+
   //Activity Subject
   $data['civicrm_activity']['subject'] = array(
     'title' => t('Subject'),
@@ -2086,6 +2107,48 @@ function _civicrm_core_data(&$data, $enabled) {
     'name' => 'activity_date_time',
   ));
 
+  //Created Activity Date
+  $data['civicrm_activity']['created_date'] = array(
+    'title' => t('Created Date'),
+    'help' => t('The Date and Time the activity was created.'),
+    'field' => array(
+      'handler' => 'civicrm_handler_field_datetime',
+      'click sortable' => TRUE,
+    ),
+    'filter' => array(
+      'handler' => 'civicrm_handler_filter_datetime',
+      'is date' => TRUE,
+    ),
+    'sort' => array(
+      'handler' => 'civicrm_handler_sort_date',
+    ),
+  );
+  civicrm_views_add_date_arguments($data['civicrm_activity'], array(
+    'title' => 'Created Date',
+    'name' => 'created_date',
+  ));
+
+  //Modified Activity Date
+  $data['civicrm_activity']['modified_date'] = array(
+    'title' => t('Modified Date'),
+    'help' => t('The Date and Time the activity was modified.'),
+    'field' => array(
+      'handler' => 'civicrm_handler_field_datetime',
+      'click sortable' => TRUE,
+    ),
+    'filter' => array(
+      'handler' => 'civicrm_handler_filter_datetime',
+      'is date' => TRUE,
+    ),
+    'sort' => array(
+      'handler' => 'civicrm_handler_sort_date',
+    ),
+  );
+  civicrm_views_add_date_arguments($data['civicrm_activity'], array(
+    'title' => 'Modified Date',
+    'name' => 'modified_date',
+  ));
+
   //Activity Duration
   $data['civicrm_activity']['duration'] = array(
     'title' => t('Duration (min)'),

From c388b3af7fcec25ca8279ca4ee8f0e758c9aa203 Mon Sep 17 00:00:00 2001
From: Matthew Wire <devel@mrwire.co.uk>
Date: Mon, 19 Mar 2018 19:23:10 +0000
Subject: [PATCH 45/86] Fix style warnings

---
 modules/views/components/civicrm.core.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/views/components/civicrm.core.inc b/modules/views/components/civicrm.core.inc
index 8ec4dad..00100aa 100644
--- a/modules/views/components/civicrm.core.inc
+++ b/modules/views/components/civicrm.core.inc
@@ -2973,7 +2973,7 @@ function _civicrm_core_data(&$data, $enabled) {
     ),
   );
 
-   $data['civicrm_tag']['parent_name'] = array(
+  $data['civicrm_tag']['parent_name'] = array(
     'title' => t('Parent Name'),
     'help' => t('Name of Parent Tag'),
     'real field' => 'parent_id',

From 14a4ae6e9b0d9792000a99f2d48e317170fbde65 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Wed, 18 Apr 2018 22:27:25 -0700
Subject: [PATCH 46/86] (NFC) Update version in header

This is a simple administrative update to the headers. It was generated with the command:

```
rgrep '| CiviCRM version 4.7' CRM/ Civi ang api bin extern install/ settings/ templates -l \
 | xargs sed -i'' "s/| CiviCRM version 4.7/| CiviCRM version 5  /g"
```

The inclusion of `|` aimed to avoid matching any non-header text (e.g. inline docs that
mentioned the version incidentally). But then I did a looser search and for just

```
rgrep 'CiviCRM version 4.7'
````

and manually patched the remainder.

Note: I'm not really keen on doing this every month, so I relaxed the header
statement -- instead of `CiviCRM version 5.0`, it's just `CiviCRM version 5`.
---
 civicrm.install                                                 | 2 +-
 drush/civicrm.drush.inc                                         | 2 +-
 modules/civicrm_engage/Engage/Report/Form/CallList.php          | 2 +-
 modules/civicrm_engage/Engage/Report/Form/List.php              | 2 +-
 modules/civicrm_engage/Engage/Report/Form/WalkList.php          | 2 +-
 modules/civicrm_engage/civicrm_engage.install                   | 2 +-
 modules/civicrm_engage/civicrm_engage.module                    | 2 +-
 .../templates/CRM/Contact/Form/Edit/Demographics.tpl            | 2 +-
 .../templates/CRM/Contact/Form/Inline/Demographics.tpl          | 2 +-
 .../templates/CRM/Contact/Page/Inline/Demographics.tpl          | 2 +-
 modules/civicrm_group_roles/civicrm_group_roles.install         | 2 +-
 modules/civicrm_group_roles/civicrm_group_roles.module          | 2 +-
 modules/civicrm_og_sync/civicrm_og_sync.install                 | 2 +-
 modules/civicrm_og_sync/civicrm_og_sync.module                  | 2 +-
 modules/civicrm_rules/civicrm_rules.contact-eval.inc            | 2 +-
 modules/civicrm_rules/civicrm_rules.event-eval.inc              | 2 +-
 modules/civicrm_rules/civicrm_rules.install                     | 2 +-
 modules/civicrm_rules/civicrm_rules.mailing-eval.inc            | 2 +-
 modules/civicrm_rules/civicrm_rules.module                      | 2 +-
 modules/civicrm_rules/civicrm_rules.participant-eval.inc        | 2 +-
 modules/civicrm_rules/civicrm_rules.rules.inc                   | 2 +-
 modules/civicrm_rules/civicrm_rules_action.inc                  | 2 +-
 modules/civicrm_rules/civicrm_rules_condition.inc               | 2 +-
 modules/civicrm_rules/civicrm_rules_entity.inc                  | 2 +-
 modules/civicrm_rules/civicrm_rules_event.inc                   | 2 +-
 modules/civicrm_rules/civicrm_rules_utils.inc                   | 2 +-
 modules/civicrmtheme/civicrmtheme.install                       | 2 +-
 modules/civicrmtheme/civicrmtheme.module                        | 2 +-
 modules/views/civicrm.views.inc                                 | 2 +-
 modules/views/civicrm.views_default.inc                         | 2 +-
 modules/views/civicrm/civicrm_handler_field.inc                 | 2 +-
 modules/views/civicrm/civicrm_handler_field_activity.inc        | 2 +-
 modules/views/civicrm/civicrm_handler_field_address.inc         | 2 +-
 modules/views/civicrm/civicrm_handler_field_component.inc       | 2 +-
 modules/views/civicrm/civicrm_handler_field_contact_link.inc    | 2 +-
 modules/views/civicrm/civicrm_handler_field_country.inc         | 2 +-
 modules/views/civicrm/civicrm_handler_field_county.inc          | 2 +-
 modules/views/civicrm/civicrm_handler_field_custom.inc          | 2 +-
 modules/views/civicrm/civicrm_handler_field_custom_file.inc     | 2 +-
 modules/views/civicrm/civicrm_handler_field_datetime.inc        | 2 +-
 modules/views/civicrm/civicrm_handler_field_drupalid.inc        | 2 +-
 modules/views/civicrm/civicrm_handler_field_email.inc           | 2 +-
 .../views/civicrm/civicrm_handler_field_encounter_medium.inc    | 2 +-
 modules/views/civicrm/civicrm_handler_field_event.inc           | 2 +-
 modules/views/civicrm/civicrm_handler_field_event_link.inc      | 2 +-
 modules/views/civicrm/civicrm_handler_field_file.inc            | 2 +-
 modules/views/civicrm/civicrm_handler_field_im.inc              | 2 +-
 modules/views/civicrm/civicrm_handler_field_link.inc            | 2 +-
 modules/views/civicrm/civicrm_handler_field_link_activity.inc   | 2 +-
 modules/views/civicrm/civicrm_handler_field_link_contact.inc    | 2 +-
 .../views/civicrm/civicrm_handler_field_link_contribution.inc   | 2 +-
 modules/views/civicrm/civicrm_handler_field_link_delete.inc     | 2 +-
 modules/views/civicrm/civicrm_handler_field_link_edit.inc       | 2 +-
 modules/views/civicrm/civicrm_handler_field_link_event.inc      | 2 +-
 .../views/civicrm/civicrm_handler_field_link_participant.inc    | 2 +-
 modules/views/civicrm/civicrm_handler_field_link_pcp.inc        | 2 +-
 .../views/civicrm/civicrm_handler_field_link_relationship.inc   | 2 +-
 modules/views/civicrm/civicrm_handler_field_location.inc        | 2 +-
 modules/views/civicrm/civicrm_handler_field_mail.inc            | 2 +-
 modules/views/civicrm/civicrm_handler_field_money.inc           | 2 +-
 modules/views/civicrm/civicrm_handler_field_option.inc          | 2 +-
 .../views/civicrm/civicrm_handler_field_pcp_raised_amount.inc   | 2 +-
 modules/views/civicrm/civicrm_handler_field_phone.inc           | 2 +-
 modules/views/civicrm/civicrm_handler_field_pseudo_constant.inc | 2 +-
 .../views/civicrm/civicrm_handler_field_relationship_type.inc   | 2 +-
 modules/views/civicrm/civicrm_handler_field_state.inc           | 2 +-
 modules/views/civicrm/civicrm_handler_field_website.inc         | 2 +-
 modules/views/civicrm/civicrm_handler_filter_contact_ref.inc    | 2 +-
 modules/views/civicrm/civicrm_handler_filter_country_multi.inc  | 2 +-
 modules/views/civicrm/civicrm_handler_filter_custom_option.inc  | 2 +-
 .../civicrm/civicrm_handler_filter_custom_single_option.inc     | 2 +-
 modules/views/civicrm/civicrm_handler_filter_datetime.inc       | 2 +-
 modules/views/civicrm/civicrm_handler_filter_domain.inc         | 2 +-
 .../views/civicrm/civicrm_handler_filter_encounter_medium.inc   | 2 +-
 modules/views/civicrm/civicrm_handler_filter_group_status.inc   | 2 +-
 modules/views/civicrm/civicrm_handler_filter_option.inc         | 2 +-
 .../views/civicrm/civicrm_handler_filter_pseudo_constant.inc    | 2 +-
 .../views/civicrm/civicrm_handler_filter_relationship_type.inc  | 2 +-
 modules/views/civicrm/civicrm_handler_filter_state_multi.inc    | 2 +-
 modules/views/civicrm/civicrm_handler_relationship_address.inc  | 2 +-
 .../civicrm/civicrm_handler_relationship_contact2users.inc      | 2 +-
 modules/views/civicrm/civicrm_handler_relationship_im.inc       | 2 +-
 modules/views/civicrm/civicrm_handler_relationship_location.inc | 2 +-
 modules/views/civicrm/civicrm_handler_relationship_mail.inc     | 2 +-
 .../civicrm_handler_relationship_memberships_contributions.inc  | 2 +-
 modules/views/civicrm/civicrm_handler_relationship_phone.inc    | 2 +-
 modules/views/civicrm/civicrm_handler_relationship_website.inc  | 2 +-
 .../civicrm/civicrm_handler_sort_address_pseudoconstant.inc     | 2 +-
 modules/views/civicrm/civicrm_handler_sort_county.inc           | 2 +-
 modules/views/civicrm/civicrm_handler_sort_date.inc             | 2 +-
 .../views/civicrm/civicrm_handler_sort_pcp_raised_amount.inc    | 2 +-
 modules/views/civicrm/civicrm_handler_sort_state.inc            | 2 +-
 modules/views/civicrm/civicrm_plugin_argument_default.inc       | 2 +-
 modules/views/civicrm/views_handler_argument_civicrm_day.inc    | 2 +-
 .../views/civicrm/views_handler_argument_civicrm_fulldate.inc   | 2 +-
 modules/views/civicrm/views_handler_argument_civicrm_month.inc  | 2 +-
 modules/views/civicrm/views_handler_argument_civicrm_week.inc   | 2 +-
 modules/views/civicrm/views_handler_argument_civicrm_year.inc   | 2 +-
 .../views/civicrm/views_handler_argument_civicrm_year_month.inc | 2 +-
 modules/views/components/civicrm.campaign.inc                   | 2 +-
 modules/views/components/civicrm.case.inc                       | 2 +-
 modules/views/components/civicrm.contribute.inc                 | 2 +-
 modules/views/components/civicrm.core.inc                       | 2 +-
 modules/views/components/civicrm.event.inc                      | 2 +-
 modules/views/components/civicrm.grant.inc                      | 2 +-
 modules/views/components/civicrm.lineitem.inc                   | 2 +-
 modules/views/components/civicrm.mail.inc                       | 2 +-
 modules/views/components/civicrm.member.inc                     | 2 +-
 modules/views/components/civicrm.price_set.inc                  | 2 +-
 .../plugins/civicrm_plugin_argument_default_civicrm_id.inc      | 2 +-
 110 files changed, 110 insertions(+), 110 deletions(-)

diff --git a/civicrm.install b/civicrm.install
index d0ca24d..bcb6759 100644
--- a/civicrm.install
+++ b/civicrm.install
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2018                                |
  +--------------------------------------------------------------------+
diff --git a/drush/civicrm.drush.inc b/drush/civicrm.drush.inc
index e4edf4a..bfa27d1 100644
--- a/drush/civicrm.drush.inc
+++ b/drush/civicrm.drush.inc
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2018                                |
  +--------------------------------------------------------------------+
diff --git a/modules/civicrm_engage/Engage/Report/Form/CallList.php b/modules/civicrm_engage/Engage/Report/Form/CallList.php
index 73e5469..447ceb4 100644
--- a/modules/civicrm_engage/Engage/Report/Form/CallList.php
+++ b/modules/civicrm_engage/Engage/Report/Form/CallList.php
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2018                                |
  +--------------------------------------------------------------------+
diff --git a/modules/civicrm_engage/Engage/Report/Form/List.php b/modules/civicrm_engage/Engage/Report/Form/List.php
index e64b181..9675b14 100644
--- a/modules/civicrm_engage/Engage/Report/Form/List.php
+++ b/modules/civicrm_engage/Engage/Report/Form/List.php
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2018                                |
  +--------------------------------------------------------------------+
diff --git a/modules/civicrm_engage/Engage/Report/Form/WalkList.php b/modules/civicrm_engage/Engage/Report/Form/WalkList.php
index 386e567..e3097e1 100644
--- a/modules/civicrm_engage/Engage/Report/Form/WalkList.php
+++ b/modules/civicrm_engage/Engage/Report/Form/WalkList.php
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2018                                |
  +--------------------------------------------------------------------+
diff --git a/modules/civicrm_engage/civicrm_engage.install b/modules/civicrm_engage/civicrm_engage.install
index 3d406a6..4e902b4 100644
--- a/modules/civicrm_engage/civicrm_engage.install
+++ b/modules/civicrm_engage/civicrm_engage.install
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2018                                |
  +--------------------------------------------------------------------+
diff --git a/modules/civicrm_engage/civicrm_engage.module b/modules/civicrm_engage/civicrm_engage.module
index 24ec592..ea7f899 100644
--- a/modules/civicrm_engage/civicrm_engage.module
+++ b/modules/civicrm_engage/civicrm_engage.module
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2018                                |
  +--------------------------------------------------------------------+
diff --git a/modules/civicrm_engage/templates/CRM/Contact/Form/Edit/Demographics.tpl b/modules/civicrm_engage/templates/CRM/Contact/Form/Edit/Demographics.tpl
index 7779ce5..392b881 100644
--- a/modules/civicrm_engage/templates/CRM/Contact/Form/Edit/Demographics.tpl
+++ b/modules/civicrm_engage/templates/CRM/Contact/Form/Edit/Demographics.tpl
@@ -1,6 +1,6 @@
 {*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2018                                |
  +--------------------------------------------------------------------+
diff --git a/modules/civicrm_engage/templates/CRM/Contact/Form/Inline/Demographics.tpl b/modules/civicrm_engage/templates/CRM/Contact/Form/Inline/Demographics.tpl
index 97c923a..92bc9be 100644
--- a/modules/civicrm_engage/templates/CRM/Contact/Form/Inline/Demographics.tpl
+++ b/modules/civicrm_engage/templates/CRM/Contact/Form/Inline/Demographics.tpl
@@ -1,6 +1,6 @@
 {*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2018                                |
  +--------------------------------------------------------------------+
diff --git a/modules/civicrm_engage/templates/CRM/Contact/Page/Inline/Demographics.tpl b/modules/civicrm_engage/templates/CRM/Contact/Page/Inline/Demographics.tpl
index 5533aa0..5d76c95 100644
--- a/modules/civicrm_engage/templates/CRM/Contact/Page/Inline/Demographics.tpl
+++ b/modules/civicrm_engage/templates/CRM/Contact/Page/Inline/Demographics.tpl
@@ -1,6 +1,6 @@
 {*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2018                                |
  +--------------------------------------------------------------------+
diff --git a/modules/civicrm_group_roles/civicrm_group_roles.install b/modules/civicrm_group_roles/civicrm_group_roles.install
index e6702d9..2be39db 100644
--- a/modules/civicrm_group_roles/civicrm_group_roles.install
+++ b/modules/civicrm_group_roles/civicrm_group_roles.install
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
diff --git a/modules/civicrm_group_roles/civicrm_group_roles.module b/modules/civicrm_group_roles/civicrm_group_roles.module
index b5e9e32..bcdf32b 100644
--- a/modules/civicrm_group_roles/civicrm_group_roles.module
+++ b/modules/civicrm_group_roles/civicrm_group_roles.module
@@ -1,7 +1,7 @@
 <?php
 /*
   +--------------------------------------------------------------------+
-  | CiviCRM version 4.7                                                |
+  | CiviCRM version 5                                                  |
   +--------------------------------------------------------------------+
   | This file is a part of CiviCRM.                                    |
   |                                                                    |
diff --git a/modules/civicrm_og_sync/civicrm_og_sync.install b/modules/civicrm_og_sync/civicrm_og_sync.install
index 82ea161..187bf90 100644
--- a/modules/civicrm_og_sync/civicrm_og_sync.install
+++ b/modules/civicrm_og_sync/civicrm_og_sync.install
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2018                                |
  +--------------------------------------------------------------------+
diff --git a/modules/civicrm_og_sync/civicrm_og_sync.module b/modules/civicrm_og_sync/civicrm_og_sync.module
index a000039..e8aec29 100644
--- a/modules/civicrm_og_sync/civicrm_og_sync.module
+++ b/modules/civicrm_og_sync/civicrm_og_sync.module
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2018                                |
  +--------------------------------------------------------------------+
diff --git a/modules/civicrm_rules/civicrm_rules.contact-eval.inc b/modules/civicrm_rules/civicrm_rules.contact-eval.inc
index 6ddac49..b2b14e2 100644
--- a/modules/civicrm_rules/civicrm_rules.contact-eval.inc
+++ b/modules/civicrm_rules/civicrm_rules.contact-eval.inc
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2018                                |
  +--------------------------------------------------------------------+
diff --git a/modules/civicrm_rules/civicrm_rules.event-eval.inc b/modules/civicrm_rules/civicrm_rules.event-eval.inc
index cc20d07..2b5f7d5 100644
--- a/modules/civicrm_rules/civicrm_rules.event-eval.inc
+++ b/modules/civicrm_rules/civicrm_rules.event-eval.inc
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2018                                |
  +--------------------------------------------------------------------+
diff --git a/modules/civicrm_rules/civicrm_rules.install b/modules/civicrm_rules/civicrm_rules.install
index f359ddf..d753435 100644
--- a/modules/civicrm_rules/civicrm_rules.install
+++ b/modules/civicrm_rules/civicrm_rules.install
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2018                                |
  +--------------------------------------------------------------------+
diff --git a/modules/civicrm_rules/civicrm_rules.mailing-eval.inc b/modules/civicrm_rules/civicrm_rules.mailing-eval.inc
index 0e198c1..6122d88 100644
--- a/modules/civicrm_rules/civicrm_rules.mailing-eval.inc
+++ b/modules/civicrm_rules/civicrm_rules.mailing-eval.inc
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2018                                |
  +--------------------------------------------------------------------+
diff --git a/modules/civicrm_rules/civicrm_rules.module b/modules/civicrm_rules/civicrm_rules.module
index 40be85c..232e119 100644
--- a/modules/civicrm_rules/civicrm_rules.module
+++ b/modules/civicrm_rules/civicrm_rules.module
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2018                                |
  +--------------------------------------------------------------------+
diff --git a/modules/civicrm_rules/civicrm_rules.participant-eval.inc b/modules/civicrm_rules/civicrm_rules.participant-eval.inc
index 640a4ab..0617a1e 100644
--- a/modules/civicrm_rules/civicrm_rules.participant-eval.inc
+++ b/modules/civicrm_rules/civicrm_rules.participant-eval.inc
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2018                                |
  +--------------------------------------------------------------------+
diff --git a/modules/civicrm_rules/civicrm_rules.rules.inc b/modules/civicrm_rules/civicrm_rules.rules.inc
index a9efe1a..e9a2406 100644
--- a/modules/civicrm_rules/civicrm_rules.rules.inc
+++ b/modules/civicrm_rules/civicrm_rules.rules.inc
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2018                                |
  +--------------------------------------------------------------------+
diff --git a/modules/civicrm_rules/civicrm_rules_action.inc b/modules/civicrm_rules/civicrm_rules_action.inc
index 9ab48e2..b76e0a1 100644
--- a/modules/civicrm_rules/civicrm_rules_action.inc
+++ b/modules/civicrm_rules/civicrm_rules_action.inc
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2018                                |
  +--------------------------------------------------------------------+
diff --git a/modules/civicrm_rules/civicrm_rules_condition.inc b/modules/civicrm_rules/civicrm_rules_condition.inc
index 99e9538..642b1ea 100644
--- a/modules/civicrm_rules/civicrm_rules_condition.inc
+++ b/modules/civicrm_rules/civicrm_rules_condition.inc
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2018                                |
  +--------------------------------------------------------------------+
diff --git a/modules/civicrm_rules/civicrm_rules_entity.inc b/modules/civicrm_rules/civicrm_rules_entity.inc
index 4a598d8..15f0879 100644
--- a/modules/civicrm_rules/civicrm_rules_entity.inc
+++ b/modules/civicrm_rules/civicrm_rules_entity.inc
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2018                                |
  +--------------------------------------------------------------------+
diff --git a/modules/civicrm_rules/civicrm_rules_event.inc b/modules/civicrm_rules/civicrm_rules_event.inc
index ee901f9..eb7ba81 100644
--- a/modules/civicrm_rules/civicrm_rules_event.inc
+++ b/modules/civicrm_rules/civicrm_rules_event.inc
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2018                                |
  +--------------------------------------------------------------------+
diff --git a/modules/civicrm_rules/civicrm_rules_utils.inc b/modules/civicrm_rules/civicrm_rules_utils.inc
index d66d5ce..5504b6b 100644
--- a/modules/civicrm_rules/civicrm_rules_utils.inc
+++ b/modules/civicrm_rules/civicrm_rules_utils.inc
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2018                                |
  +--------------------------------------------------------------------+
diff --git a/modules/civicrmtheme/civicrmtheme.install b/modules/civicrmtheme/civicrmtheme.install
index efe6a33..f8e609c 100644
--- a/modules/civicrmtheme/civicrmtheme.install
+++ b/modules/civicrmtheme/civicrmtheme.install
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2018                                |
  +--------------------------------------------------------------------+
diff --git a/modules/civicrmtheme/civicrmtheme.module b/modules/civicrmtheme/civicrmtheme.module
index d34b5f7..7987c1d 100644
--- a/modules/civicrmtheme/civicrmtheme.module
+++ b/modules/civicrmtheme/civicrmtheme.module
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2018                                |
  +--------------------------------------------------------------------+
diff --git a/modules/views/civicrm.views.inc b/modules/views/civicrm.views.inc
index 53799ab..71678ca 100644
--- a/modules/views/civicrm.views.inc
+++ b/modules/views/civicrm.views.inc
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
diff --git a/modules/views/civicrm.views_default.inc b/modules/views/civicrm.views_default.inc
index 345963b..f06268b 100644
--- a/modules/views/civicrm.views_default.inc
+++ b/modules/views/civicrm.views_default.inc
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
diff --git a/modules/views/civicrm/civicrm_handler_field.inc b/modules/views/civicrm/civicrm_handler_field.inc
index c592fd5..12a768b 100644
--- a/modules/views/civicrm/civicrm_handler_field.inc
+++ b/modules/views/civicrm/civicrm_handler_field.inc
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
diff --git a/modules/views/civicrm/civicrm_handler_field_activity.inc b/modules/views/civicrm/civicrm_handler_field_activity.inc
index 9c88027..c376ffd 100644
--- a/modules/views/civicrm/civicrm_handler_field_activity.inc
+++ b/modules/views/civicrm/civicrm_handler_field_activity.inc
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                               |
+ | CiviCRM version 5                                                 |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
diff --git a/modules/views/civicrm/civicrm_handler_field_address.inc b/modules/views/civicrm/civicrm_handler_field_address.inc
index f5ab8c7..6ca62f2 100644
--- a/modules/views/civicrm/civicrm_handler_field_address.inc
+++ b/modules/views/civicrm/civicrm_handler_field_address.inc
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
diff --git a/modules/views/civicrm/civicrm_handler_field_component.inc b/modules/views/civicrm/civicrm_handler_field_component.inc
index 385d462..8f2a265 100644
--- a/modules/views/civicrm/civicrm_handler_field_component.inc
+++ b/modules/views/civicrm/civicrm_handler_field_component.inc
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
diff --git a/modules/views/civicrm/civicrm_handler_field_contact_link.inc b/modules/views/civicrm/civicrm_handler_field_contact_link.inc
index 263d3e1..52f5810 100644
--- a/modules/views/civicrm/civicrm_handler_field_contact_link.inc
+++ b/modules/views/civicrm/civicrm_handler_field_contact_link.inc
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
diff --git a/modules/views/civicrm/civicrm_handler_field_country.inc b/modules/views/civicrm/civicrm_handler_field_country.inc
index 308a6cf..2645e90 100644
--- a/modules/views/civicrm/civicrm_handler_field_country.inc
+++ b/modules/views/civicrm/civicrm_handler_field_country.inc
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
diff --git a/modules/views/civicrm/civicrm_handler_field_county.inc b/modules/views/civicrm/civicrm_handler_field_county.inc
index e8e59a6..7cc73be 100644
--- a/modules/views/civicrm/civicrm_handler_field_county.inc
+++ b/modules/views/civicrm/civicrm_handler_field_county.inc
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
diff --git a/modules/views/civicrm/civicrm_handler_field_custom.inc b/modules/views/civicrm/civicrm_handler_field_custom.inc
index 6fef0b9..4c54b1b 100644
--- a/modules/views/civicrm/civicrm_handler_field_custom.inc
+++ b/modules/views/civicrm/civicrm_handler_field_custom.inc
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
diff --git a/modules/views/civicrm/civicrm_handler_field_custom_file.inc b/modules/views/civicrm/civicrm_handler_field_custom_file.inc
index 2ada172..6873d94 100644
--- a/modules/views/civicrm/civicrm_handler_field_custom_file.inc
+++ b/modules/views/civicrm/civicrm_handler_field_custom_file.inc
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
diff --git a/modules/views/civicrm/civicrm_handler_field_datetime.inc b/modules/views/civicrm/civicrm_handler_field_datetime.inc
index 0e29a81..14bc472 100644
--- a/modules/views/civicrm/civicrm_handler_field_datetime.inc
+++ b/modules/views/civicrm/civicrm_handler_field_datetime.inc
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
diff --git a/modules/views/civicrm/civicrm_handler_field_drupalid.inc b/modules/views/civicrm/civicrm_handler_field_drupalid.inc
index 09e71d5..84cdb68 100644
--- a/modules/views/civicrm/civicrm_handler_field_drupalid.inc
+++ b/modules/views/civicrm/civicrm_handler_field_drupalid.inc
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
diff --git a/modules/views/civicrm/civicrm_handler_field_email.inc b/modules/views/civicrm/civicrm_handler_field_email.inc
index 5319f54..878ec31 100644
--- a/modules/views/civicrm/civicrm_handler_field_email.inc
+++ b/modules/views/civicrm/civicrm_handler_field_email.inc
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
diff --git a/modules/views/civicrm/civicrm_handler_field_encounter_medium.inc b/modules/views/civicrm/civicrm_handler_field_encounter_medium.inc
index 9309430..1160c76 100644
--- a/modules/views/civicrm/civicrm_handler_field_encounter_medium.inc
+++ b/modules/views/civicrm/civicrm_handler_field_encounter_medium.inc
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
diff --git a/modules/views/civicrm/civicrm_handler_field_event.inc b/modules/views/civicrm/civicrm_handler_field_event.inc
index 72ce8e8..327e2fe 100644
--- a/modules/views/civicrm/civicrm_handler_field_event.inc
+++ b/modules/views/civicrm/civicrm_handler_field_event.inc
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
diff --git a/modules/views/civicrm/civicrm_handler_field_event_link.inc b/modules/views/civicrm/civicrm_handler_field_event_link.inc
index 917ebf9..66a3e42 100644
--- a/modules/views/civicrm/civicrm_handler_field_event_link.inc
+++ b/modules/views/civicrm/civicrm_handler_field_event_link.inc
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
diff --git a/modules/views/civicrm/civicrm_handler_field_file.inc b/modules/views/civicrm/civicrm_handler_field_file.inc
index 3a9cc50..23126c8 100644
--- a/modules/views/civicrm/civicrm_handler_field_file.inc
+++ b/modules/views/civicrm/civicrm_handler_field_file.inc
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
diff --git a/modules/views/civicrm/civicrm_handler_field_im.inc b/modules/views/civicrm/civicrm_handler_field_im.inc
index bc9edce..98cc949 100644
--- a/modules/views/civicrm/civicrm_handler_field_im.inc
+++ b/modules/views/civicrm/civicrm_handler_field_im.inc
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
diff --git a/modules/views/civicrm/civicrm_handler_field_link.inc b/modules/views/civicrm/civicrm_handler_field_link.inc
index f77269a..b137bca 100644
--- a/modules/views/civicrm/civicrm_handler_field_link.inc
+++ b/modules/views/civicrm/civicrm_handler_field_link.inc
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
diff --git a/modules/views/civicrm/civicrm_handler_field_link_activity.inc b/modules/views/civicrm/civicrm_handler_field_link_activity.inc
index 7855ff9..deb6679 100644
--- a/modules/views/civicrm/civicrm_handler_field_link_activity.inc
+++ b/modules/views/civicrm/civicrm_handler_field_link_activity.inc
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
diff --git a/modules/views/civicrm/civicrm_handler_field_link_contact.inc b/modules/views/civicrm/civicrm_handler_field_link_contact.inc
index c363a8f..5fadf72 100644
--- a/modules/views/civicrm/civicrm_handler_field_link_contact.inc
+++ b/modules/views/civicrm/civicrm_handler_field_link_contact.inc
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
diff --git a/modules/views/civicrm/civicrm_handler_field_link_contribution.inc b/modules/views/civicrm/civicrm_handler_field_link_contribution.inc
index 1c79903..5e1242a 100644
--- a/modules/views/civicrm/civicrm_handler_field_link_contribution.inc
+++ b/modules/views/civicrm/civicrm_handler_field_link_contribution.inc
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
diff --git a/modules/views/civicrm/civicrm_handler_field_link_delete.inc b/modules/views/civicrm/civicrm_handler_field_link_delete.inc
index e9c9251..c9dc963 100644
--- a/modules/views/civicrm/civicrm_handler_field_link_delete.inc
+++ b/modules/views/civicrm/civicrm_handler_field_link_delete.inc
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
diff --git a/modules/views/civicrm/civicrm_handler_field_link_edit.inc b/modules/views/civicrm/civicrm_handler_field_link_edit.inc
index 134a4e7..4271cf8 100644
--- a/modules/views/civicrm/civicrm_handler_field_link_edit.inc
+++ b/modules/views/civicrm/civicrm_handler_field_link_edit.inc
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
diff --git a/modules/views/civicrm/civicrm_handler_field_link_event.inc b/modules/views/civicrm/civicrm_handler_field_link_event.inc
index f06ae77..2eed881 100644
--- a/modules/views/civicrm/civicrm_handler_field_link_event.inc
+++ b/modules/views/civicrm/civicrm_handler_field_link_event.inc
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
diff --git a/modules/views/civicrm/civicrm_handler_field_link_participant.inc b/modules/views/civicrm/civicrm_handler_field_link_participant.inc
index 26e7a8d..1c64a4c 100644
--- a/modules/views/civicrm/civicrm_handler_field_link_participant.inc
+++ b/modules/views/civicrm/civicrm_handler_field_link_participant.inc
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
diff --git a/modules/views/civicrm/civicrm_handler_field_link_pcp.inc b/modules/views/civicrm/civicrm_handler_field_link_pcp.inc
index 4675ad8..5f9ddaa 100644
--- a/modules/views/civicrm/civicrm_handler_field_link_pcp.inc
+++ b/modules/views/civicrm/civicrm_handler_field_link_pcp.inc
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
diff --git a/modules/views/civicrm/civicrm_handler_field_link_relationship.inc b/modules/views/civicrm/civicrm_handler_field_link_relationship.inc
index 87d02a9..9e764ee 100644
--- a/modules/views/civicrm/civicrm_handler_field_link_relationship.inc
+++ b/modules/views/civicrm/civicrm_handler_field_link_relationship.inc
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
diff --git a/modules/views/civicrm/civicrm_handler_field_location.inc b/modules/views/civicrm/civicrm_handler_field_location.inc
index 9dad348..2847a8c 100644
--- a/modules/views/civicrm/civicrm_handler_field_location.inc
+++ b/modules/views/civicrm/civicrm_handler_field_location.inc
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
diff --git a/modules/views/civicrm/civicrm_handler_field_mail.inc b/modules/views/civicrm/civicrm_handler_field_mail.inc
index e1b4834..ac8473e 100644
--- a/modules/views/civicrm/civicrm_handler_field_mail.inc
+++ b/modules/views/civicrm/civicrm_handler_field_mail.inc
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
diff --git a/modules/views/civicrm/civicrm_handler_field_money.inc b/modules/views/civicrm/civicrm_handler_field_money.inc
index 715135f..80ba29f 100644
--- a/modules/views/civicrm/civicrm_handler_field_money.inc
+++ b/modules/views/civicrm/civicrm_handler_field_money.inc
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
diff --git a/modules/views/civicrm/civicrm_handler_field_option.inc b/modules/views/civicrm/civicrm_handler_field_option.inc
index 7ed23c4..6d99c50 100644
--- a/modules/views/civicrm/civicrm_handler_field_option.inc
+++ b/modules/views/civicrm/civicrm_handler_field_option.inc
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
diff --git a/modules/views/civicrm/civicrm_handler_field_pcp_raised_amount.inc b/modules/views/civicrm/civicrm_handler_field_pcp_raised_amount.inc
index aef390e..71d8185 100644
--- a/modules/views/civicrm/civicrm_handler_field_pcp_raised_amount.inc
+++ b/modules/views/civicrm/civicrm_handler_field_pcp_raised_amount.inc
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
diff --git a/modules/views/civicrm/civicrm_handler_field_phone.inc b/modules/views/civicrm/civicrm_handler_field_phone.inc
index 8d044bd..32a3e93 100644
--- a/modules/views/civicrm/civicrm_handler_field_phone.inc
+++ b/modules/views/civicrm/civicrm_handler_field_phone.inc
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                               |
+ | CiviCRM version 5                                                 |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
diff --git a/modules/views/civicrm/civicrm_handler_field_pseudo_constant.inc b/modules/views/civicrm/civicrm_handler_field_pseudo_constant.inc
index d810e85..6e3d24e 100644
--- a/modules/views/civicrm/civicrm_handler_field_pseudo_constant.inc
+++ b/modules/views/civicrm/civicrm_handler_field_pseudo_constant.inc
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
diff --git a/modules/views/civicrm/civicrm_handler_field_relationship_type.inc b/modules/views/civicrm/civicrm_handler_field_relationship_type.inc
index 851a306..58a7565 100644
--- a/modules/views/civicrm/civicrm_handler_field_relationship_type.inc
+++ b/modules/views/civicrm/civicrm_handler_field_relationship_type.inc
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
diff --git a/modules/views/civicrm/civicrm_handler_field_state.inc b/modules/views/civicrm/civicrm_handler_field_state.inc
index 477f712..234111f 100644
--- a/modules/views/civicrm/civicrm_handler_field_state.inc
+++ b/modules/views/civicrm/civicrm_handler_field_state.inc
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                               |
+ | CiviCRM version 5                                                 |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
diff --git a/modules/views/civicrm/civicrm_handler_field_website.inc b/modules/views/civicrm/civicrm_handler_field_website.inc
index d76c384..706c6c1 100644
--- a/modules/views/civicrm/civicrm_handler_field_website.inc
+++ b/modules/views/civicrm/civicrm_handler_field_website.inc
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                               |
+ | CiviCRM version 5                                                 |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
diff --git a/modules/views/civicrm/civicrm_handler_filter_contact_ref.inc b/modules/views/civicrm/civicrm_handler_filter_contact_ref.inc
index 3eb8964..83e27c8 100644
--- a/modules/views/civicrm/civicrm_handler_filter_contact_ref.inc
+++ b/modules/views/civicrm/civicrm_handler_filter_contact_ref.inc
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
diff --git a/modules/views/civicrm/civicrm_handler_filter_country_multi.inc b/modules/views/civicrm/civicrm_handler_filter_country_multi.inc
index e19a291..65949b2 100644
--- a/modules/views/civicrm/civicrm_handler_filter_country_multi.inc
+++ b/modules/views/civicrm/civicrm_handler_filter_country_multi.inc
@@ -1,7 +1,7 @@
 <?php
 /*
    +--------------------------------------------------------------------+
-   | CiviCRM version 4.7                                                |
+   | CiviCRM version 5                                                  |
    +--------------------------------------------------------------------+
    | This file is a part of CiviCRM.                                    |
    |                                                                    |
diff --git a/modules/views/civicrm/civicrm_handler_filter_custom_option.inc b/modules/views/civicrm/civicrm_handler_filter_custom_option.inc
index 61341dc..b7a0ac3 100644
--- a/modules/views/civicrm/civicrm_handler_filter_custom_option.inc
+++ b/modules/views/civicrm/civicrm_handler_filter_custom_option.inc
@@ -1,7 +1,7 @@
 <?php
 /*
    +--------------------------------------------------------------------+
-   | CiviCRM version 4.7                                                |
+   | CiviCRM version 5                                                  |
    +--------------------------------------------------------------------+
    | This file is a part of CiviCRM.                                    |
    |                                                                    |
diff --git a/modules/views/civicrm/civicrm_handler_filter_custom_single_option.inc b/modules/views/civicrm/civicrm_handler_filter_custom_single_option.inc
index b135dae..ea5a5b1 100644
--- a/modules/views/civicrm/civicrm_handler_filter_custom_single_option.inc
+++ b/modules/views/civicrm/civicrm_handler_filter_custom_single_option.inc
@@ -1,7 +1,7 @@
 <?php
 /*
    +--------------------------------------------------------------------+
-   | CiviCRM version 4.7                                                |
+   | CiviCRM version 5                                                  |
    +--------------------------------------------------------------------+
    | This file is a part of CiviCRM.                                    |
    |                                                                    |
diff --git a/modules/views/civicrm/civicrm_handler_filter_datetime.inc b/modules/views/civicrm/civicrm_handler_filter_datetime.inc
index 2dc8c03..c529977 100644
--- a/modules/views/civicrm/civicrm_handler_filter_datetime.inc
+++ b/modules/views/civicrm/civicrm_handler_filter_datetime.inc
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
diff --git a/modules/views/civicrm/civicrm_handler_filter_domain.inc b/modules/views/civicrm/civicrm_handler_filter_domain.inc
index 26e59e8..455dbe5 100644
--- a/modules/views/civicrm/civicrm_handler_filter_domain.inc
+++ b/modules/views/civicrm/civicrm_handler_filter_domain.inc
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
diff --git a/modules/views/civicrm/civicrm_handler_filter_encounter_medium.inc b/modules/views/civicrm/civicrm_handler_filter_encounter_medium.inc
index f2f67ca..413c8b0 100644
--- a/modules/views/civicrm/civicrm_handler_filter_encounter_medium.inc
+++ b/modules/views/civicrm/civicrm_handler_filter_encounter_medium.inc
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
diff --git a/modules/views/civicrm/civicrm_handler_filter_group_status.inc b/modules/views/civicrm/civicrm_handler_filter_group_status.inc
index 8ff2f56..e3935d7 100644
--- a/modules/views/civicrm/civicrm_handler_filter_group_status.inc
+++ b/modules/views/civicrm/civicrm_handler_filter_group_status.inc
@@ -1,7 +1,7 @@
 <?php
 /*
   +--------------------------------------------------------------------+
-  | CiviCRM version 4.7                                                |
+  | CiviCRM version 5                                                  |
   +--------------------------------------------------------------------+
   | This file is a part of CiviCRM.                                    |
   |                                                                    |
diff --git a/modules/views/civicrm/civicrm_handler_filter_option.inc b/modules/views/civicrm/civicrm_handler_filter_option.inc
index 2ef3021..ee346bc 100644
--- a/modules/views/civicrm/civicrm_handler_filter_option.inc
+++ b/modules/views/civicrm/civicrm_handler_filter_option.inc
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
diff --git a/modules/views/civicrm/civicrm_handler_filter_pseudo_constant.inc b/modules/views/civicrm/civicrm_handler_filter_pseudo_constant.inc
index f3bd3ba..8ef9c7f 100644
--- a/modules/views/civicrm/civicrm_handler_filter_pseudo_constant.inc
+++ b/modules/views/civicrm/civicrm_handler_filter_pseudo_constant.inc
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
diff --git a/modules/views/civicrm/civicrm_handler_filter_relationship_type.inc b/modules/views/civicrm/civicrm_handler_filter_relationship_type.inc
index 1747040..66588e7 100644
--- a/modules/views/civicrm/civicrm_handler_filter_relationship_type.inc
+++ b/modules/views/civicrm/civicrm_handler_filter_relationship_type.inc
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
diff --git a/modules/views/civicrm/civicrm_handler_filter_state_multi.inc b/modules/views/civicrm/civicrm_handler_filter_state_multi.inc
index cd1ed74..854c126 100644
--- a/modules/views/civicrm/civicrm_handler_filter_state_multi.inc
+++ b/modules/views/civicrm/civicrm_handler_filter_state_multi.inc
@@ -1,7 +1,7 @@
 <?php
 /*
    +--------------------------------------------------------------------+
-   | CiviCRM version 4.7                                                |
+   | CiviCRM version 5                                                  |
    +--------------------------------------------------------------------+
    | This file is a part of CiviCRM.                                    |
    |                                                                    |
diff --git a/modules/views/civicrm/civicrm_handler_relationship_address.inc b/modules/views/civicrm/civicrm_handler_relationship_address.inc
index c856607..02a675f 100644
--- a/modules/views/civicrm/civicrm_handler_relationship_address.inc
+++ b/modules/views/civicrm/civicrm_handler_relationship_address.inc
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
diff --git a/modules/views/civicrm/civicrm_handler_relationship_contact2users.inc b/modules/views/civicrm/civicrm_handler_relationship_contact2users.inc
index 736083b..c0c3c80 100644
--- a/modules/views/civicrm/civicrm_handler_relationship_contact2users.inc
+++ b/modules/views/civicrm/civicrm_handler_relationship_contact2users.inc
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
diff --git a/modules/views/civicrm/civicrm_handler_relationship_im.inc b/modules/views/civicrm/civicrm_handler_relationship_im.inc
index b22462e..4167ca1 100644
--- a/modules/views/civicrm/civicrm_handler_relationship_im.inc
+++ b/modules/views/civicrm/civicrm_handler_relationship_im.inc
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
diff --git a/modules/views/civicrm/civicrm_handler_relationship_location.inc b/modules/views/civicrm/civicrm_handler_relationship_location.inc
index acd2024..f83c259 100644
--- a/modules/views/civicrm/civicrm_handler_relationship_location.inc
+++ b/modules/views/civicrm/civicrm_handler_relationship_location.inc
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
diff --git a/modules/views/civicrm/civicrm_handler_relationship_mail.inc b/modules/views/civicrm/civicrm_handler_relationship_mail.inc
index 4ba40a7..ea45c95 100644
--- a/modules/views/civicrm/civicrm_handler_relationship_mail.inc
+++ b/modules/views/civicrm/civicrm_handler_relationship_mail.inc
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
diff --git a/modules/views/civicrm/civicrm_handler_relationship_memberships_contributions.inc b/modules/views/civicrm/civicrm_handler_relationship_memberships_contributions.inc
index d9e1e8b..09b39f3 100644
--- a/modules/views/civicrm/civicrm_handler_relationship_memberships_contributions.inc
+++ b/modules/views/civicrm/civicrm_handler_relationship_memberships_contributions.inc
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
diff --git a/modules/views/civicrm/civicrm_handler_relationship_phone.inc b/modules/views/civicrm/civicrm_handler_relationship_phone.inc
index 43c7284..6a8f03a 100644
--- a/modules/views/civicrm/civicrm_handler_relationship_phone.inc
+++ b/modules/views/civicrm/civicrm_handler_relationship_phone.inc
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
diff --git a/modules/views/civicrm/civicrm_handler_relationship_website.inc b/modules/views/civicrm/civicrm_handler_relationship_website.inc
index e5388c8..20876cd 100644
--- a/modules/views/civicrm/civicrm_handler_relationship_website.inc
+++ b/modules/views/civicrm/civicrm_handler_relationship_website.inc
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
diff --git a/modules/views/civicrm/civicrm_handler_sort_address_pseudoconstant.inc b/modules/views/civicrm/civicrm_handler_sort_address_pseudoconstant.inc
index 6ea609f..2979eef 100644
--- a/modules/views/civicrm/civicrm_handler_sort_address_pseudoconstant.inc
+++ b/modules/views/civicrm/civicrm_handler_sort_address_pseudoconstant.inc
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
diff --git a/modules/views/civicrm/civicrm_handler_sort_county.inc b/modules/views/civicrm/civicrm_handler_sort_county.inc
index 1fbca4e..cfb5071 100644
--- a/modules/views/civicrm/civicrm_handler_sort_county.inc
+++ b/modules/views/civicrm/civicrm_handler_sort_county.inc
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
diff --git a/modules/views/civicrm/civicrm_handler_sort_date.inc b/modules/views/civicrm/civicrm_handler_sort_date.inc
index 397cc6d..fff1d09 100644
--- a/modules/views/civicrm/civicrm_handler_sort_date.inc
+++ b/modules/views/civicrm/civicrm_handler_sort_date.inc
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
diff --git a/modules/views/civicrm/civicrm_handler_sort_pcp_raised_amount.inc b/modules/views/civicrm/civicrm_handler_sort_pcp_raised_amount.inc
index 45f2938..c6d3f80 100644
--- a/modules/views/civicrm/civicrm_handler_sort_pcp_raised_amount.inc
+++ b/modules/views/civicrm/civicrm_handler_sort_pcp_raised_amount.inc
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
diff --git a/modules/views/civicrm/civicrm_handler_sort_state.inc b/modules/views/civicrm/civicrm_handler_sort_state.inc
index 1ad3302..31192ee 100644
--- a/modules/views/civicrm/civicrm_handler_sort_state.inc
+++ b/modules/views/civicrm/civicrm_handler_sort_state.inc
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
diff --git a/modules/views/civicrm/civicrm_plugin_argument_default.inc b/modules/views/civicrm/civicrm_plugin_argument_default.inc
index 8628e6b..c25969c 100644
--- a/modules/views/civicrm/civicrm_plugin_argument_default.inc
+++ b/modules/views/civicrm/civicrm_plugin_argument_default.inc
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
diff --git a/modules/views/civicrm/views_handler_argument_civicrm_day.inc b/modules/views/civicrm/views_handler_argument_civicrm_day.inc
index 0b4eafd..5b3b6ab 100644
--- a/modules/views/civicrm/views_handler_argument_civicrm_day.inc
+++ b/modules/views/civicrm/views_handler_argument_civicrm_day.inc
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
diff --git a/modules/views/civicrm/views_handler_argument_civicrm_fulldate.inc b/modules/views/civicrm/views_handler_argument_civicrm_fulldate.inc
index 6232c3a..137e24a 100644
--- a/modules/views/civicrm/views_handler_argument_civicrm_fulldate.inc
+++ b/modules/views/civicrm/views_handler_argument_civicrm_fulldate.inc
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
diff --git a/modules/views/civicrm/views_handler_argument_civicrm_month.inc b/modules/views/civicrm/views_handler_argument_civicrm_month.inc
index 923b1c6..71a5d65 100644
--- a/modules/views/civicrm/views_handler_argument_civicrm_month.inc
+++ b/modules/views/civicrm/views_handler_argument_civicrm_month.inc
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
diff --git a/modules/views/civicrm/views_handler_argument_civicrm_week.inc b/modules/views/civicrm/views_handler_argument_civicrm_week.inc
index 16d6977..462cf49 100644
--- a/modules/views/civicrm/views_handler_argument_civicrm_week.inc
+++ b/modules/views/civicrm/views_handler_argument_civicrm_week.inc
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
diff --git a/modules/views/civicrm/views_handler_argument_civicrm_year.inc b/modules/views/civicrm/views_handler_argument_civicrm_year.inc
index 9422d16..bddf9bc 100644
--- a/modules/views/civicrm/views_handler_argument_civicrm_year.inc
+++ b/modules/views/civicrm/views_handler_argument_civicrm_year.inc
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
diff --git a/modules/views/civicrm/views_handler_argument_civicrm_year_month.inc b/modules/views/civicrm/views_handler_argument_civicrm_year_month.inc
index a36aefb..fb8459c 100644
--- a/modules/views/civicrm/views_handler_argument_civicrm_year_month.inc
+++ b/modules/views/civicrm/views_handler_argument_civicrm_year_month.inc
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
diff --git a/modules/views/components/civicrm.campaign.inc b/modules/views/components/civicrm.campaign.inc
index 78cd12d..b8ab0e0 100644
--- a/modules/views/components/civicrm.campaign.inc
+++ b/modules/views/components/civicrm.campaign.inc
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
diff --git a/modules/views/components/civicrm.case.inc b/modules/views/components/civicrm.case.inc
index 5136b84..ae88555 100644
--- a/modules/views/components/civicrm.case.inc
+++ b/modules/views/components/civicrm.case.inc
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
diff --git a/modules/views/components/civicrm.contribute.inc b/modules/views/components/civicrm.contribute.inc
index b7919dd..cda1509 100644
--- a/modules/views/components/civicrm.contribute.inc
+++ b/modules/views/components/civicrm.contribute.inc
@@ -1,7 +1,7 @@
 <?php
 /*
   +--------------------------------------------------------------------+
-  | CiviCRM version 4.7                                                |
+  | CiviCRM version 5                                                  |
   +--------------------------------------------------------------------+
   | This file is a part of CiviCRM.                                    |
   |                                                                    |
diff --git a/modules/views/components/civicrm.core.inc b/modules/views/components/civicrm.core.inc
index 955057d..6a95020 100644
--- a/modules/views/components/civicrm.core.inc
+++ b/modules/views/components/civicrm.core.inc
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
diff --git a/modules/views/components/civicrm.event.inc b/modules/views/components/civicrm.event.inc
index 3be2577..a58ac83 100644
--- a/modules/views/components/civicrm.event.inc
+++ b/modules/views/components/civicrm.event.inc
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
diff --git a/modules/views/components/civicrm.grant.inc b/modules/views/components/civicrm.grant.inc
index ed27b39..c95118e 100644
--- a/modules/views/components/civicrm.grant.inc
+++ b/modules/views/components/civicrm.grant.inc
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
diff --git a/modules/views/components/civicrm.lineitem.inc b/modules/views/components/civicrm.lineitem.inc
index 6e1c811..ff1dfcb 100644
--- a/modules/views/components/civicrm.lineitem.inc
+++ b/modules/views/components/civicrm.lineitem.inc
@@ -1,7 +1,7 @@
 <?php
 /*
   +--------------------------------------------------------------------+
-  | CiviCRM version 4.7                                                |
+  | CiviCRM version 5                                                  |
   +--------------------------------------------------------------------+
   | This file is a part of CiviCRM.                                    |
   |                                                                    |
diff --git a/modules/views/components/civicrm.mail.inc b/modules/views/components/civicrm.mail.inc
index 2cf8ab8..0ab51ef 100644
--- a/modules/views/components/civicrm.mail.inc
+++ b/modules/views/components/civicrm.mail.inc
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
diff --git a/modules/views/components/civicrm.member.inc b/modules/views/components/civicrm.member.inc
index ffe913f..dc8f9e3 100644
--- a/modules/views/components/civicrm.member.inc
+++ b/modules/views/components/civicrm.member.inc
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
diff --git a/modules/views/components/civicrm.price_set.inc b/modules/views/components/civicrm.price_set.inc
index 2d19ab0..149d15d 100644
--- a/modules/views/components/civicrm.price_set.inc
+++ b/modules/views/components/civicrm.price_set.inc
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
diff --git a/modules/views/plugins/civicrm_plugin_argument_default_civicrm_id.inc b/modules/views/plugins/civicrm_plugin_argument_default_civicrm_id.inc
index ad4d61b..6bc1f61 100644
--- a/modules/views/plugins/civicrm_plugin_argument_default_civicrm_id.inc
+++ b/modules/views/plugins/civicrm_plugin_argument_default_civicrm_id.inc
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |

From 31108c186388e1ebfbbff39da5ac155e6c2542d4 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Tue, 5 Jun 2018 09:16:38 -0400
Subject: [PATCH 47/86] dev/core/#152 - AdvMulti-Select cleanup

---
 modules/views/civicrm.views.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/views/civicrm.views.inc b/modules/views/civicrm.views.inc
index 71678ca..253112a 100644
--- a/modules/views/civicrm.views.inc
+++ b/modules/views/civicrm.views.inc
@@ -461,7 +461,7 @@ function civicrm_views_get_field($data_type, $html_type = NULL) {
   // Relying on html types as opposed to data types seems like a code smell.
   // Would love to be able to remove this logic.
   $customHTMLTypes = array(
-    'Select', 'Multi-Select', 'AdvMulti-Select', 'Radio', 'CheckBox',
+    'Select', 'Multi-Select', 'Radio', 'CheckBox',
     'Select State/Province', 'Select Country', 'Multi-Select Country',
     'Multi-Select State/Province', 'Autocomplete-Select',
   );
@@ -563,7 +563,7 @@ function civicrm_views_get_filter($data_type, $html_type = NULL, $option_group_i
   // Relying on html types as opposed to data types seems like a code smell.
   // Would love to be able to remove this logic.
   $customMultiValueHTMLTypes = array(
-    'Multi-Select', 'AdvMulti-Select', 'CheckBox', 'Multi-Select Country',
+    'Multi-Select', 'CheckBox', 'Multi-Select Country',
     'Multi-Select State/Province',
   );
   if ($html_type == 'Multi-Select Country') {

From 184d69f506e38a52875f8d450951374ad364577b Mon Sep 17 00:00:00 2001
From: anemirovsky <anemirovsky@giantrabbit.com>
Date: Fri, 15 Jun 2018 15:01:49 -0700
Subject: [PATCH 48/86] Fix Views custom field handler not displaying select
 value labels.

The current handler looks up the CiviCRM custom field ID using the field's
label, which is not intended to be unique. More than one field can exist
across multiple different custom field groups with the same field label. If
that happens, when attempting to pull the list of select field options, the
handler will just use the field with the lowest field ID for all fields that
have the same field label, so the field's value won't get rendered.

This change makes the handler use the field's column_name to look up the
field id, which is unique across all fields in CiviCRM.
---
 modules/views/civicrm/civicrm_handler_field_custom.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/views/civicrm/civicrm_handler_field_custom.inc b/modules/views/civicrm/civicrm_handler_field_custom.inc
index 4c54b1b..a0c032e 100644
--- a/modules/views/civicrm/civicrm_handler_field_custom.inc
+++ b/modules/views/civicrm/civicrm_handler_field_custom.inc
@@ -70,7 +70,7 @@ class civicrm_handler_field_custom extends views_handler_field {
         if (!is_null($value)) {
           // get the field id from the db
           if (!empty($this->definition['title'])) {
-            $customFieldID = CRM_Core_DAO::getFieldValue('CRM_Core_BAO_CustomField', $this->definition['title'], 'id', 'label');
+            $customFieldID = CRM_Core_DAO::getFieldValue('CRM_Core_BAO_CustomField', $this->real_field, 'id', 'column_name');
             return CRM_Core_BAO_CustomField::displayValue($value, $customFieldID);
           }
           // could not get custom id, lets just return what we have

From 583ae8382a50d15fc6675a122d7869e1c10206e6 Mon Sep 17 00:00:00 2001
From: JKingsnorth <john@johnkingsnorth.co.uk>
Date: Mon, 23 Jul 2018 17:07:31 +0100
Subject: [PATCH 49/86] NFC Code style fix

---
 modules/views/civicrm/civicrm_handler_field_contact_image.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/views/civicrm/civicrm_handler_field_contact_image.inc b/modules/views/civicrm/civicrm_handler_field_contact_image.inc
index 1bd77b3..dffe741 100644
--- a/modules/views/civicrm/civicrm_handler_field_contact_image.inc
+++ b/modules/views/civicrm/civicrm_handler_field_contact_image.inc
@@ -86,7 +86,7 @@ class civicrm_handler_field_contact_image extends views_handler_field {
       '#dependency' => array(
         'edit-options-url-only' => array(0),
       ),
-            '#prefix' => t('If you do not see Drupal image styles here, it may be worth checking CiviCRM "Custom files directory" <br> at <strong>"CiviCRM > Administer > System Settings > Directories" </strong> : it <strong>has to </strong> contain <italic>[civicrm.files]</italic> token'), 
+      '#prefix' => t('If you do not see Drupal image styles here, it may be worth checking CiviCRM "Custom files directory" <br> at <strong>"CiviCRM > Administer > System Settings > Directories" </strong> : it <strong>has to </strong> contain <italic>[civicrm.files]</italic> token'),
     );
 
     $form['height'] = array(

From 7fcce8b5c0245505e54ffcba5cf79345c7610ab0 Mon Sep 17 00:00:00 2001
From: john <john@civifirst.com>
Date: Sun, 12 Aug 2018 10:21:33 -0400
Subject: [PATCH 50/86] Drupal Views CiviCRM: Allow Participant record to be
 used from Event.

---
 civicrm.info                                  |  1 +
 ...vicrm_handler_relationship_participant.inc | 73 +++++++++++++++++++
 modules/views/components/civicrm.core.inc     | 12 +++
 3 files changed, 86 insertions(+)
 create mode 100644 modules/views/civicrm/civicrm_handler_relationship_participant.inc

diff --git a/civicrm.info b/civicrm.info
index 38862f5..a146ec8 100644
--- a/civicrm.info
+++ b/civicrm.info
@@ -96,6 +96,7 @@ files[] = modules/views/civicrm/civicrm_handler_relationship_phone.inc
 files[] = modules/views/civicrm/civicrm_handler_relationship_im.inc
 files[] = modules/views/civicrm/civicrm_handler_relationship_website.inc
 files[] = modules/views/civicrm/civicrm_handler_relationship_address.inc
+files[] = modules/views/civicrm/civicrm_handler_relationship_participant.inc
 
 ; views plugins
 files[] = modules/views/plugins/calendar_plugin_row_civicrm.inc
diff --git a/modules/views/civicrm/civicrm_handler_relationship_participant.inc b/modules/views/civicrm/civicrm_handler_relationship_participant.inc
new file mode 100644
index 0000000..a27e2f2
--- /dev/null
+++ b/modules/views/civicrm/civicrm_handler_relationship_participant.inc
@@ -0,0 +1,73 @@
+<?php
+
+/**
+ * This relationship handler is used when joining the civicrm_participant table
+ * to the civicrm_event table. This handler allows us to optionally add conditions
+ * to the join clause based on relationship_type_id and is_active.
+ */
+class civicrm_handler_relationship_participant extends views_handler_relationship {
+  static $participant_types;
+
+  /**
+   * Preload the list of participant roles and store in the static variable
+   * $participant_types
+   */
+  public function construct() {
+    parent::construct();
+
+    if (!civicrm_initialize()) {
+      return;
+    }
+
+    $rawParticipantRoles = civicrm_api3('Participant', 'getoptions', [
+      'field' => "participant_role_id",
+    ]);
+
+    self::$participant_types = $rawParticipantRoles['values'];
+  }
+
+  /**
+   * Add additional options for participant_type options to the view. By
+   * defining these here, Views will take care of saving the
+   * values submitted from the options form.
+   */
+  public function option_definition() {
+    $options = parent::option_definition();
+    $options['participant_type'] = array('default' => 0);
+    return $options;
+  }
+
+  /**
+   * Add participant_type dropdown to relationship configuration form.
+   */
+  public function options_form(&$form, &$form_state) {
+    parent::options_form($form, $form_state);
+
+    $form['participant_type'] = array(
+      '#type' => 'select',
+      '#multiple' => TRUE,
+      '#title' => 'Choose a specific Participant type',
+      '#options' => self::$participant_types,
+      '#description' => t('Choose to limit this relationship to one or more specific types of CiviCRM Participant.'),
+      '#default_value' => $this->options['participant_type'],
+    );
+  }
+
+  /**
+   * Modify the default views relationship query to optionally specify
+   * join conditions for participant_type
+   */
+  public function query() {
+    parent::query();
+
+    // Specify the type of participants to join
+    if (isset($this->options['participant_type']) && $this->options['participant_type']) {
+      $this->query->table_queue[$this->alias]['join']->extra[] = array(
+        'value' => $this->options['participant_type'],
+        'numeric' => TRUE,
+        'field' => 'role_id',
+      );
+    }
+  }
+
+}
diff --git a/modules/views/components/civicrm.core.inc b/modules/views/components/civicrm.core.inc
index 6a95020..b82d8cf 100644
--- a/modules/views/components/civicrm.core.inc
+++ b/modules/views/components/civicrm.core.inc
@@ -157,6 +157,18 @@ function _civicrm_core_data(&$data, $enabled) {
     ),
   );
 
+  $data['civicrm_event']['civicrm_participant'] = array(
+    'real field' => 'id',
+    'title' => t('CiviCRM Participant'),
+    'help' => t('Allows a Participant Contact relationship from an Event'),
+    'relationship' => array(
+      'base' => 'civicrm_participant',
+      'base field' => 'event_id',
+      'handler' => 'civicrm_handler_relationship_participant',
+      'label' => t('CiviCRM Participant'),
+    ),
+  );
+
   // Drupal ID of the contact (from uf_match.uf_id)
   $data['civicrm_contact']['drupal_id'] = array(
     'real field' => 'id',

From 9567c7018c510eea6a72cfaa73527da03047da27 Mon Sep 17 00:00:00 2001
From: John Kingsnorth <john@johnkingsnorth.co.uk>
Date: Fri, 17 Aug 2018 21:29:28 +0100
Subject: [PATCH 51/86] Don't render an empty mailto link for empty email
 addresses

---
 modules/views/civicrm/civicrm_handler_field_email.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/views/civicrm/civicrm_handler_field_email.inc b/modules/views/civicrm/civicrm_handler_field_email.inc
index 878ec31..887d7d4 100644
--- a/modules/views/civicrm/civicrm_handler_field_email.inc
+++ b/modules/views/civicrm/civicrm_handler_field_email.inc
@@ -57,7 +57,7 @@ class civicrm_handler_field_email extends civicrm_handler_field_location {
   }
 
   public function render($values) {
-    if ($this->options['link_to_user'] == 'mailto') {
+    if ($this->options['link_to_user'] == 'mailto' && !empty($values->{$this->field_alias})) {
       return l($values->{$this->field_alias}, "mailto:" . $values->{$this->field_alias});
     }
     return check_plain($values->{$this->field_alias});

From 19863d9df5aef936ec955ca85b9887044010fe49 Mon Sep 17 00:00:00 2001
From: Thomas <tmannell@rnao.ca>
Date: Fri, 31 Aug 2018 11:32:43 -0400
Subject: [PATCH 52/86] PHP 7.1 incompatibility error fix

---
 civicrm.module | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/civicrm.module b/civicrm.module
index b25d54d..91fe817 100644
--- a/civicrm.module
+++ b/civicrm.module
@@ -584,10 +584,10 @@ function civicrm_form_data($edit, &$user, $category, $reset, $doNotProcess = FAL
     // do not allow edit for anon users in joomla frontend, CRM-4668, unless u have checksum CRM-5228
     $config = CRM_Core_Config::singleton();
     if ($config->userFrameworkFrontend) {
-      CRM_Contact_BAO_Contact_Permission::validateOnlyChecksum($userID, $this);
+      CRM_Contact_BAO_Contact_Permission::validateOnlyChecksum($userID, $edit);
     }
     else {
-      CRM_Contact_BAO_Contact_Permission::validateChecksumContact($userID, $this);
+      CRM_Contact_BAO_Contact_Permission::validateChecksumContact($userID, $edit);
     }
   }
   $ctype = CRM_Core_DAO::getFieldValue('CRM_Contact_DAO_Contact', $userID, 'contact_type');

From 216f661147db11298aed1872fae08bc868586d41 Mon Sep 17 00:00:00 2001
From: Jitendra Purohit <jitendra@fuzion.co.nz>
Date: Tue, 11 Sep 2018 15:41:01 +0530
Subject: [PATCH 53/86] dev/core#381 - Clear session vars while retriving the
 files with id and eid

---
 modules/views/civicrm/civicrm_handler_field_file.inc | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/modules/views/civicrm/civicrm_handler_field_file.inc b/modules/views/civicrm/civicrm_handler_field_file.inc
index 23126c8..36cc32d 100644
--- a/modules/views/civicrm/civicrm_handler_field_file.inc
+++ b/modules/views/civicrm/civicrm_handler_field_file.inc
@@ -61,6 +61,11 @@ class civicrm_handler_field_custom_file extends views_handler_field {
 
         $path = sprintf('%s/imagefile', $path);
       }
+      //Reset session params as we send only id and eid to retrieve the file.
+      $file = new CRM_Core_Page_File();
+      $file->set('filename', NULL);
+      $file->set('mime-type', NULL);
+
       $entityField = $this->aliases['entity_id'];
       $url = CRM_Utils_System::url($path,
         "id={$value}&eid={$values->$entityField}",

From 2ee7538c65ef4bb37dd5c4d0d65568cd11d396fd Mon Sep 17 00:00:00 2001
From: Jitendra Purohit <jitendra@fuzion.co.nz>
Date: Thu, 27 Sep 2018 14:28:04 +0530
Subject: [PATCH 54/86] dev/drupal#31 - CiviMember Role sync is no longer
 syncing Pending memberships

---
 .../civicrm_member_roles/civicrm_member_roles.module  | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/modules/civicrm_member_roles/civicrm_member_roles.module b/modules/civicrm_member_roles/civicrm_member_roles.module
index b604ab8..2e05d7c 100644
--- a/modules/civicrm_member_roles/civicrm_member_roles.module
+++ b/modules/civicrm_member_roles/civicrm_member_roles.module
@@ -575,7 +575,16 @@ function _civicrm_member_roles_sync($ext_uid = NULL, $cid = NULL, $sync_type = N
         $inactive[] = $value['id'];
       }
       foreach ($memberships['values'] as $key => $membership) {
-        if (in_array($membership['status_id'], $inactive)) {
+        //Do not unset if inactive membership status is chosen as an option for synchronization.
+        $inactiveStatusSync = FALSE;
+        if (!empty($memberroles[$membership['membership_type_id']])) {
+          foreach ($memberroles[$membership['membership_type_id']] as $rolerule) {
+            if (in_array($membership['status_id'], $rolerule['codes']['current'])) {
+              $inactiveStatusSync = TRUE;
+            }
+          }
+        }
+        if (in_array($membership['status_id'], $inactive) && !$inactiveStatusSync) {
           unset($memberships['values'][$key]);
         }
       }

From be2b59928a749f59c09c0046d66b57c53e735b02 Mon Sep 17 00:00:00 2001
From: Elliott Eggleston <ejegg@ejegg.com>
Date: Fri, 5 Oct 2018 18:41:50 -0500
Subject: [PATCH 55/86] Add a drush command to rebuild SQL triggers

drush civicrm-sql-rebuild-triggers will now rebuild triggers, or
dump the required SQL commands to a file. Without this, one has to
do something sketchy like turn logging off and on in order to sync
triggers or dump the full file.
---
 drush/civicrm.drush.inc | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/drush/civicrm.drush.inc b/drush/civicrm.drush.inc
index bfa27d1..a2fde7b 100644
--- a/drush/civicrm.drush.inc
+++ b/drush/civicrm.drush.inc
@@ -226,6 +226,13 @@ function civicrm_drush_command() {
     'aliases' => array('cvsqlc'),
     'bootstrap' => DRUSH_BOOTSTRAP_DRUPAL_CONFIGURATION,
   );
+  $items['civicrm-sql-rebuild-triggers'] = array(
+    'description' => 'Rebuild SQL triggers',
+    'aliases' => array('cvsqlrt'),
+    'options' => array(
+      'table' => 'Specific table to target. If omitted, triggers for all tables are rebuilt.',
+    ),
+  );
   $items['civicrm-process-mail-queue'] = array(
     'description' => "Process pending CiviMail mailing jobs.",
     'examples' => array(
@@ -1605,3 +1612,17 @@ function drush_civicrm_sync_users_contacts() {
   drush_print(dt($status));
   return $result;
 }
+
+function drush_civicrm_sql_rebuild_triggers() {
+  $table = drush_get_option('table', NULL);
+  civicrm_initialize();
+  $triggerService = Civi::service('sql_triggers');
+  $triggerService->rebuild($table, TRUE);
+  if (\Civi::settings()->get('logging_no_trigger_permission')) {
+    $file = $triggerService->getFile();
+    drush_print("Trigger SQL written to $file");
+  }
+  else {
+    drush_print("Triggers rebuilt");
+  }
+}

From fabd188da9e6f3dff129b861cd6cf4e99b8247fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Frank=20J=2E=20G=C3=B3mez?= <frank@ginkgostreet.com>
Date: Fri, 17 Mar 2017 15:46:14 -0400
Subject: [PATCH 56/86] CRM-20298: Money fields will display filters
 appropriate for dealing with numbers.

---
 modules/views/civicrm.views.inc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/views/civicrm.views.inc b/modules/views/civicrm.views.inc
index 253112a..cb63029 100644
--- a/modules/views/civicrm.views.inc
+++ b/modules/views/civicrm.views.inc
@@ -594,6 +594,7 @@ function civicrm_views_get_filter($data_type, $html_type = NULL, $option_group_i
 
     case "Float":
     case "Int":
+    case "Money":
       return array('handler' => 'views_handler_filter_numeric', 'allow empty' => TRUE);
 
     case "Date":

From a1147886ce850e2aaf6de568964af5bd730d6055 Mon Sep 17 00:00:00 2001
From: Mathieu Lutfy <mathieu@bidon.ca>
Date: Fri, 26 Oct 2018 14:13:31 -0400
Subject: [PATCH 57/86] civicrm_handler_field_link_pcp: avoid PHP notice

This function generated PHP notices 'Undefined property: stdClass::$unknown',
yet the field_alias is not used anyway in the render_link() function. The change
proposed here is consistent with similar changes elsewhere (ex: 8da894b5).
---
 modules/views/civicrm/civicrm_handler_field_link_pcp.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/views/civicrm/civicrm_handler_field_link_pcp.inc b/modules/views/civicrm/civicrm_handler_field_link_pcp.inc
index 5f9ddaa..26bfb0e 100644
--- a/modules/views/civicrm/civicrm_handler_field_link_pcp.inc
+++ b/modules/views/civicrm/civicrm_handler_field_link_pcp.inc
@@ -107,7 +107,7 @@ class civicrm_handler_field_link_pcp extends views_handler_field {
   }
 
   public function render($values) {
-    return $this->render_link(check_plain($values->{$this->field_alias}), $values);
+    return $this->render_link(NULL, $values);
   }
 
 }

From 8cef9f77d0c31ca6819e284ec9b6b77d7f838bbd Mon Sep 17 00:00:00 2001
From: JKingsnorth <john@johnkingsnorth.co.uk>
Date: Mon, 29 Oct 2018 06:52:28 -0700
Subject: [PATCH 58/86] CRM-17667 Drush process mail queue (7.x)

---
 drush/civicrm.drush.inc | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/drush/civicrm.drush.inc b/drush/civicrm.drush.inc
index a2fde7b..10b06e9 100644
--- a/drush/civicrm.drush.inc
+++ b/drush/civicrm.drush.inc
@@ -1086,13 +1086,6 @@ function drush_civicrm_restore() {
   _civicrm_dsn_close();
 }
 
-/**
- * ?? for command 'civicrm-civimail'
- */
-function drush_civicrm_civimail_cron() {
-  civicrm_api('Mailing', 'Process', array('version' => 3));
-}
-
 /**
  * Implementation of command 'civicrm-member-records'
  */
@@ -1626,3 +1619,19 @@ function drush_civicrm_sql_rebuild_triggers() {
     drush_print("Triggers rebuilt");
   }
 }
+
+/**
+ * Callback function for civicrm-process-mail-queue.
+ *
+ * Call the process_mailing job to process any outstanding mailing jobs. This
+ * command will need to be run as a user with the correct permissions to
+ * process mailings.
+ *
+ * @see civicrm_drush_command()
+ */
+function drush_civicrm_process_mail_queue() {
+  $init = _civicrm_init();
+  $facility = new CRM_Core_JobManager();
+  $facility->setSingleRunParams('Job', 'process_mailing', array(), 'Started by drush');
+  $facility->executeJobByAction('Job', 'process_mailing');
+}

From 91d9321cf4fee6d190842fa534a5ceb1b50877f5 Mon Sep 17 00:00:00 2001
From: Francis Whittle <francis@agileware.com.au>
Date: Mon, 29 Oct 2018 17:12:15 +1100
Subject: [PATCH 59/86] CIVICRM-984: Make "Add CiviCRM Tag to Contact" action
 list tags, not groups

---
 .../civicrm_rules.contact-eval.inc            | 21 +++++++++++++++++++
 .../civicrm_rules/civicrm_rules_action.inc    |  2 +-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/modules/civicrm_rules/civicrm_rules.contact-eval.inc b/modules/civicrm_rules/civicrm_rules.contact-eval.inc
index b2b14e2..232c75d 100644
--- a/modules/civicrm_rules/civicrm_rules.contact-eval.inc
+++ b/modules/civicrm_rules/civicrm_rules.contact-eval.inc
@@ -144,3 +144,24 @@ function civicrm_rules_options_list() {
   $settings['groups'] = _civicrm_get_groups();
   return $settings;
 }
+
+/**
+ * Options list callback for listing of CiviCRM Tags
+ */
+function civicrm_rules_tags_list() {
+  if(!civicrm_initialize()) {
+    return array();
+  }
+  $result = civicrm_api3('tag', 'get', array(
+              'used_for' => 'civicrm_contact',
+              'options'  => array(
+                'limit' => 0,
+                'sort'  => 'name ASC'
+              )
+            ));
+  $values = array();
+  foreach($result['values'] as $tag) {
+    $values[$tag['id']] = $tag['name'];
+  }
+  return $values;
+}
diff --git a/modules/civicrm_rules/civicrm_rules_action.inc b/modules/civicrm_rules/civicrm_rules_action.inc
index b76e0a1..811273b 100644
--- a/modules/civicrm_rules/civicrm_rules_action.inc
+++ b/modules/civicrm_rules/civicrm_rules_action.inc
@@ -96,7 +96,7 @@ The content of the email is:
       'civicrm_tags' => array(
         'type' => 'list<integer>',
         'label' => t('CiviCRM Tags'),
-        'options list' => 'civicrm_rules_options_list',
+        'options list' => 'civicrm_rules_tags_list',
       ),
     ),
     'group' => t('CiviCRM Contact'),

From 5b00ee99bfc2535b267f8d36a142046429cb553f Mon Sep 17 00:00:00 2001
From: Francis Whittle <francis@agileware.com.au>
Date: Fri, 9 Nov 2018 15:41:20 +1100
Subject: [PATCH 60/86] CIVICRM-984: Update indentation and spacing from
 feedback.

---
 .../civicrm_rules/civicrm_rules.contact-eval.inc | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/modules/civicrm_rules/civicrm_rules.contact-eval.inc b/modules/civicrm_rules/civicrm_rules.contact-eval.inc
index 232c75d..96a1f77 100644
--- a/modules/civicrm_rules/civicrm_rules.contact-eval.inc
+++ b/modules/civicrm_rules/civicrm_rules.contact-eval.inc
@@ -149,18 +149,18 @@ function civicrm_rules_options_list() {
  * Options list callback for listing of CiviCRM Tags
  */
 function civicrm_rules_tags_list() {
-  if(!civicrm_initialize()) {
+  if (!civicrm_initialize()) {
     return array();
   }
   $result = civicrm_api3('tag', 'get', array(
-              'used_for' => 'civicrm_contact',
-              'options'  => array(
-                'limit' => 0,
-                'sort'  => 'name ASC'
-              )
-            ));
+    'used_for' => 'civicrm_contact',
+    'options' => array(
+      'limit' => 0,
+      'sort' => 'name ASC'
+    )
+  ));
   $values = array();
-  foreach($result['values'] as $tag) {
+  foreach ($result['values'] as $tag) {
     $values[$tag['id']] = $tag['name'];
   }
   return $values;

From 13c4937b94e32d8dea895828e781670b03a9b1fe Mon Sep 17 00:00:00 2001
From: Francis Whittle <francis@agileware.com.au>
Date: Mon, 12 Nov 2018 10:35:56 +1100
Subject: [PATCH 61/86] CIVICRM-984: Satisfy Checkstyle CommaLastItem warnings.

---
 modules/civicrm_rules/civicrm_rules.contact-eval.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/civicrm_rules/civicrm_rules.contact-eval.inc b/modules/civicrm_rules/civicrm_rules.contact-eval.inc
index 96a1f77..b3b3fb9 100644
--- a/modules/civicrm_rules/civicrm_rules.contact-eval.inc
+++ b/modules/civicrm_rules/civicrm_rules.contact-eval.inc
@@ -156,8 +156,8 @@ function civicrm_rules_tags_list() {
     'used_for' => 'civicrm_contact',
     'options' => array(
       'limit' => 0,
-      'sort' => 'name ASC'
-    )
+      'sort' => 'name ASC',
+    ),
   ));
   $values = array();
   foreach ($result['values'] as $tag) {

From 5969a587609ba37e695aff9ddfd938a832523205 Mon Sep 17 00:00:00 2001
From: Aidan Saunders <aidan.saunders@squiffle.uk>
Date: Tue, 4 Dec 2018 14:23:46 +0000
Subject: [PATCH 62/86] Make address Supplemental line 3 available to views

---
 modules/views/components/civicrm.core.inc | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/modules/views/components/civicrm.core.inc b/modules/views/components/civicrm.core.inc
index b82d8cf..9d72e37 100644
--- a/modules/views/components/civicrm.core.inc
+++ b/modules/views/components/civicrm.core.inc
@@ -957,6 +957,27 @@ function _civicrm_core_data(&$data, $enabled) {
     ),
   );
 
+  //FULL STREET ADDRESS SUPPLEMENTAL 3
+  $data['civicrm_address']['supplemental_address_3'] = array(
+    'title' => t('3rd Supplemental Street Address'),
+    'help' => t('3rd Supplemental Street Address such as Apartment or Suite Number or Department'),
+    'field' => array(
+      'handler' => 'civicrm_handler_field_address',
+      'click sortable' => TRUE,
+      'dao class' => 'CRM_Core_DAO_Address',
+    ),
+    'argument' => array(
+      'handler' => 'views_handler_argument_string',
+    ),
+    'filter' => array(
+      'handler' => 'views_handler_filter_string',
+      'allow empty' => TRUE,
+    ),
+    'sort' => array(
+      'handler' => 'views_handler_sort',
+    ),
+  );
+
   //CITY OR SUBURB THE ADDRESS IS AT
   $data['civicrm_address']['city'] = array(
     'title' => t('City / Suburb'),

From e087756fae13dd7ab523fc6657c42b4a9f29a1ef Mon Sep 17 00:00:00 2001
From: Luciano Spiegel <l.spiegel@ixiam.com>
Date: Tue, 11 Dec 2018 13:40:08 +0100
Subject: [PATCH 63/86] set proper path for civicrm.settings.php when civicrm
 under profiles/ folder

---
 civicrm.config.php.drupal | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/civicrm.config.php.drupal b/civicrm.config.php.drupal
index e20590a..c302d6f 100644
--- a/civicrm.config.php.drupal
+++ b/civicrm.config.php.drupal
@@ -58,6 +58,7 @@ function civicrm_conf_init() {
     // to the script that invokes it
     $moduleDir  = 'sites' . DIRECTORY_SEPARATOR . 'all' . DIRECTORY_SEPARATOR . 'modules';
     $contribDir = $moduleDir . DIRECTORY_SEPARATOR . 'contrib';
+    $profileDir = DIRECTORY_SEPARATOR . 'profiles' . DIRECTORY_SEPARATOR;
     // check to see if this is under sites/all/modules/contrib or subdir civicrm-core
     if (strpos($currentDir, $contribDir) !== FALSE || strpos($currentDir, 'civicrm-core') !== FALSE) {
       $confdir = $currentDir . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..';
@@ -66,6 +67,17 @@ function civicrm_conf_init() {
     elseif (strpos($currentDir, $moduleDir) !== FALSE) {
       $confdir = $currentDir . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..';
     }
+    // check to see if this is under profiles/[PROFILE]/modules
+    elseif (strpos($currentDir, $profileDir) !== FALSE) {
+      // check to see if this is under profiles/[PROFILE]/modules/contrib
+      if (strpos($currentDir, "contrib") !== FALSE) {
+        $sublevels = 5;
+      }
+      else {
+        $sublevels = 4;
+      }
+      $confdir = $currentDir . str_repeat('..' . DIRECTORY_SEPARATOR, $sublevels) . 'sites';
+    }
     else {
       $confdir = $currentDir . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR;
     }

From d1e4e7754cf1b3f3ccc06613d62ab181c74dd7f8 Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Thu, 13 Dec 2018 12:44:50 +1100
Subject: [PATCH 64/86] Update Copywrite header to change to 2019

---
 civicrm.install                                               | 4 ++--
 civicrm.module                                                | 2 +-
 drush/civicrm.drush.inc                                       | 4 ++--
 modules/civicrm_engage/Engage/Report/Form/CallList.php        | 4 ++--
 modules/civicrm_engage/Engage/Report/Form/List.php            | 4 ++--
 modules/civicrm_engage/Engage/Report/Form/WalkList.php        | 4 ++--
 modules/civicrm_engage/civicrm_engage.install                 | 4 ++--
 modules/civicrm_engage/civicrm_engage.module                  | 4 ++--
 .../templates/CRM/Contact/Form/Edit/Demographics.tpl          | 2 +-
 .../templates/CRM/Contact/Form/Inline/Demographics.tpl        | 2 +-
 .../templates/CRM/Contact/Page/Inline/Demographics.tpl        | 2 +-
 modules/civicrm_og_sync/civicrm_og_sync.install               | 4 ++--
 modules/civicrm_og_sync/civicrm_og_sync.module                | 4 ++--
 modules/civicrm_rules/civicrm_rules.contact-eval.inc          | 4 ++--
 modules/civicrm_rules/civicrm_rules.event-eval.inc            | 4 ++--
 modules/civicrm_rules/civicrm_rules.install                   | 4 ++--
 modules/civicrm_rules/civicrm_rules.mailing-eval.inc          | 4 ++--
 modules/civicrm_rules/civicrm_rules.module                    | 4 ++--
 modules/civicrm_rules/civicrm_rules.participant-eval.inc      | 4 ++--
 modules/civicrm_rules/civicrm_rules.rules.inc                 | 4 ++--
 modules/civicrm_rules/civicrm_rules_action.inc                | 4 ++--
 modules/civicrm_rules/civicrm_rules_condition.inc             | 4 ++--
 modules/civicrm_rules/civicrm_rules_entity.inc                | 4 ++--
 modules/civicrm_rules/civicrm_rules_event.inc                 | 4 ++--
 modules/civicrm_rules/civicrm_rules_utils.inc                 | 4 ++--
 modules/civicrmtheme/civicrmtheme.install                     | 4 ++--
 modules/civicrmtheme/civicrmtheme.module                      | 4 ++--
 27 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/civicrm.install b/civicrm.install
index bcb6759..8a9a7e3 100644
--- a/civicrm.install
+++ b/civicrm.install
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2018                                |
+ | Copyright CiviCRM LLC (c) 2004-2019                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2018
+ * @copyright CiviCRM LLC (c) 2004-2019
  * $Id$
  *
  */
diff --git a/civicrm.module b/civicrm.module
index b25d54d..168413a 100644
--- a/civicrm.module
+++ b/civicrm.module
@@ -26,7 +26,7 @@
  * Drupal module file.
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2018
+ * @copyright CiviCRM LLC (c) 2004-2019
  */
 require_once 'civicrm_user.inc';
 
diff --git a/drush/civicrm.drush.inc b/drush/civicrm.drush.inc
index 10b06e9..394b6b4 100644
--- a/drush/civicrm.drush.inc
+++ b/drush/civicrm.drush.inc
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2018                                |
+ | Copyright CiviCRM LLC (c) 2004-2019                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2018
+ * @copyright CiviCRM LLC (c) 2004-2019
  */
 
 /**
diff --git a/modules/civicrm_engage/Engage/Report/Form/CallList.php b/modules/civicrm_engage/Engage/Report/Form/CallList.php
index 447ceb4..426d133 100644
--- a/modules/civicrm_engage/Engage/Report/Form/CallList.php
+++ b/modules/civicrm_engage/Engage/Report/Form/CallList.php
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2018                                |
+ | Copyright CiviCRM LLC (c) 2004-2019                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2018
+ * @copyright CiviCRM LLC (c) 2004-2019
  * @copyright DharmaTech  (c) 2009
  * $Id$
  *
diff --git a/modules/civicrm_engage/Engage/Report/Form/List.php b/modules/civicrm_engage/Engage/Report/Form/List.php
index 9675b14..de29227 100644
--- a/modules/civicrm_engage/Engage/Report/Form/List.php
+++ b/modules/civicrm_engage/Engage/Report/Form/List.php
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2018                                |
+ | Copyright CiviCRM LLC (c) 2004-2019                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2018
+ * @copyright CiviCRM LLC (c) 2004-2019
  * @copyright DharmaTech  (c) 2009
  * $Id$
  *
diff --git a/modules/civicrm_engage/Engage/Report/Form/WalkList.php b/modules/civicrm_engage/Engage/Report/Form/WalkList.php
index e3097e1..c2643b7 100644
--- a/modules/civicrm_engage/Engage/Report/Form/WalkList.php
+++ b/modules/civicrm_engage/Engage/Report/Form/WalkList.php
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2018                                |
+ | Copyright CiviCRM LLC (c) 2004-2019                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2018
+ * @copyright CiviCRM LLC (c) 2004-2019
  * @copyright DharmaTech  (c) 2009
  * $Id$
  *
diff --git a/modules/civicrm_engage/civicrm_engage.install b/modules/civicrm_engage/civicrm_engage.install
index 4e902b4..e346910 100644
--- a/modules/civicrm_engage/civicrm_engage.install
+++ b/modules/civicrm_engage/civicrm_engage.install
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2018                                |
+ | Copyright CiviCRM LLC (c) 2004-2019                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2018
+ * @copyright CiviCRM LLC (c) 2004-2019
  * $Id$
  *
  */
diff --git a/modules/civicrm_engage/civicrm_engage.module b/modules/civicrm_engage/civicrm_engage.module
index ea7f899..3a094e0 100644
--- a/modules/civicrm_engage/civicrm_engage.module
+++ b/modules/civicrm_engage/civicrm_engage.module
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2018                                |
+ | Copyright CiviCRM LLC (c) 2004-2019                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2018
+ * @copyright CiviCRM LLC (c) 2004-2019
  * $Id$
  *
  */
diff --git a/modules/civicrm_engage/templates/CRM/Contact/Form/Edit/Demographics.tpl b/modules/civicrm_engage/templates/CRM/Contact/Form/Edit/Demographics.tpl
index 392b881..e414588 100644
--- a/modules/civicrm_engage/templates/CRM/Contact/Form/Edit/Demographics.tpl
+++ b/modules/civicrm_engage/templates/CRM/Contact/Form/Edit/Demographics.tpl
@@ -2,7 +2,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2018                                |
+ | Copyright CiviCRM LLC (c) 2004-2019                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
diff --git a/modules/civicrm_engage/templates/CRM/Contact/Form/Inline/Demographics.tpl b/modules/civicrm_engage/templates/CRM/Contact/Form/Inline/Demographics.tpl
index 92bc9be..19f43a8 100644
--- a/modules/civicrm_engage/templates/CRM/Contact/Form/Inline/Demographics.tpl
+++ b/modules/civicrm_engage/templates/CRM/Contact/Form/Inline/Demographics.tpl
@@ -2,7 +2,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2018                                |
+ | Copyright CiviCRM LLC (c) 2004-2019                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
diff --git a/modules/civicrm_engage/templates/CRM/Contact/Page/Inline/Demographics.tpl b/modules/civicrm_engage/templates/CRM/Contact/Page/Inline/Demographics.tpl
index 5d76c95..5d82122 100644
--- a/modules/civicrm_engage/templates/CRM/Contact/Page/Inline/Demographics.tpl
+++ b/modules/civicrm_engage/templates/CRM/Contact/Page/Inline/Demographics.tpl
@@ -2,7 +2,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2018                                |
+ | Copyright CiviCRM LLC (c) 2004-2019                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
diff --git a/modules/civicrm_og_sync/civicrm_og_sync.install b/modules/civicrm_og_sync/civicrm_og_sync.install
index 187bf90..17e7df3 100644
--- a/modules/civicrm_og_sync/civicrm_og_sync.install
+++ b/modules/civicrm_og_sync/civicrm_og_sync.install
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2018                                |
+ | Copyright CiviCRM LLC (c) 2004-2019                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2018
+ * @copyright CiviCRM LLC (c) 2004-2019
  * $Id$
  *
  */
diff --git a/modules/civicrm_og_sync/civicrm_og_sync.module b/modules/civicrm_og_sync/civicrm_og_sync.module
index e8aec29..7aaca50 100644
--- a/modules/civicrm_og_sync/civicrm_og_sync.module
+++ b/modules/civicrm_og_sync/civicrm_og_sync.module
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2018                                |
+ | Copyright CiviCRM LLC (c) 2004-2019                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2018
+ * @copyright CiviCRM LLC (c) 2004-2019
  * $Id$
  *
  */
diff --git a/modules/civicrm_rules/civicrm_rules.contact-eval.inc b/modules/civicrm_rules/civicrm_rules.contact-eval.inc
index b2b14e2..c6c14b1 100644
--- a/modules/civicrm_rules/civicrm_rules.contact-eval.inc
+++ b/modules/civicrm_rules/civicrm_rules.contact-eval.inc
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2018                                |
+ | Copyright CiviCRM LLC (c) 2004-2019                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2018
+ * @copyright CiviCRM LLC (c) 2004-2019
  * $Id$
  *
  */
diff --git a/modules/civicrm_rules/civicrm_rules.event-eval.inc b/modules/civicrm_rules/civicrm_rules.event-eval.inc
index 2b5f7d5..659f81d 100644
--- a/modules/civicrm_rules/civicrm_rules.event-eval.inc
+++ b/modules/civicrm_rules/civicrm_rules.event-eval.inc
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2018                                |
+ | Copyright CiviCRM LLC (c) 2004-2019                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2018
+ * @copyright CiviCRM LLC (c) 2004-2019
  * $Id$
  *
  */
diff --git a/modules/civicrm_rules/civicrm_rules.install b/modules/civicrm_rules/civicrm_rules.install
index d753435..4335284 100644
--- a/modules/civicrm_rules/civicrm_rules.install
+++ b/modules/civicrm_rules/civicrm_rules.install
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2018                                |
+ | Copyright CiviCRM LLC (c) 2004-2019                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2018
+ * @copyright CiviCRM LLC (c) 2004-2019
  * $Id$
  *
  */
diff --git a/modules/civicrm_rules/civicrm_rules.mailing-eval.inc b/modules/civicrm_rules/civicrm_rules.mailing-eval.inc
index 6122d88..d385c39 100644
--- a/modules/civicrm_rules/civicrm_rules.mailing-eval.inc
+++ b/modules/civicrm_rules/civicrm_rules.mailing-eval.inc
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2018                                |
+ | Copyright CiviCRM LLC (c) 2004-2019                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2018
+ * @copyright CiviCRM LLC (c) 2004-2019
  * $Id$
  *
  */
diff --git a/modules/civicrm_rules/civicrm_rules.module b/modules/civicrm_rules/civicrm_rules.module
index 232e119..852f174 100644
--- a/modules/civicrm_rules/civicrm_rules.module
+++ b/modules/civicrm_rules/civicrm_rules.module
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2018                                |
+ | Copyright CiviCRM LLC (c) 2004-2019                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2018
+ * @copyright CiviCRM LLC (c) 2004-2019
  * $Id$
  *
  */
diff --git a/modules/civicrm_rules/civicrm_rules.participant-eval.inc b/modules/civicrm_rules/civicrm_rules.participant-eval.inc
index 0617a1e..d0d0c9a 100644
--- a/modules/civicrm_rules/civicrm_rules.participant-eval.inc
+++ b/modules/civicrm_rules/civicrm_rules.participant-eval.inc
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2018                                |
+ | Copyright CiviCRM LLC (c) 2004-2019                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2018
+ * @copyright CiviCRM LLC (c) 2004-2019
  * $Id$
  *
  */
diff --git a/modules/civicrm_rules/civicrm_rules.rules.inc b/modules/civicrm_rules/civicrm_rules.rules.inc
index e9a2406..a0ee2c0 100644
--- a/modules/civicrm_rules/civicrm_rules.rules.inc
+++ b/modules/civicrm_rules/civicrm_rules.rules.inc
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2018                                |
+ | Copyright CiviCRM LLC (c) 2004-2019                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2018
+ * @copyright CiviCRM LLC (c) 2004-2019
  * $Id$
  *
  */
diff --git a/modules/civicrm_rules/civicrm_rules_action.inc b/modules/civicrm_rules/civicrm_rules_action.inc
index b76e0a1..a3ed67e 100644
--- a/modules/civicrm_rules/civicrm_rules_action.inc
+++ b/modules/civicrm_rules/civicrm_rules_action.inc
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2018                                |
+ | Copyright CiviCRM LLC (c) 2004-2019                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2018
+ * @copyright CiviCRM LLC (c) 2004-2019
  * $Id$
  *
  */
diff --git a/modules/civicrm_rules/civicrm_rules_condition.inc b/modules/civicrm_rules/civicrm_rules_condition.inc
index 642b1ea..4b956f9 100644
--- a/modules/civicrm_rules/civicrm_rules_condition.inc
+++ b/modules/civicrm_rules/civicrm_rules_condition.inc
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2018                                |
+ | Copyright CiviCRM LLC (c) 2004-2019                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2018
+ * @copyright CiviCRM LLC (c) 2004-2019
  * $Id$
  *
  */
diff --git a/modules/civicrm_rules/civicrm_rules_entity.inc b/modules/civicrm_rules/civicrm_rules_entity.inc
index 15f0879..b49d2c6 100644
--- a/modules/civicrm_rules/civicrm_rules_entity.inc
+++ b/modules/civicrm_rules/civicrm_rules_entity.inc
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2018                                |
+ | Copyright CiviCRM LLC (c) 2004-2019                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2018
+ * @copyright CiviCRM LLC (c) 2004-2019
  * $Id$
  *
  */
diff --git a/modules/civicrm_rules/civicrm_rules_event.inc b/modules/civicrm_rules/civicrm_rules_event.inc
index eb7ba81..82d45bb 100644
--- a/modules/civicrm_rules/civicrm_rules_event.inc
+++ b/modules/civicrm_rules/civicrm_rules_event.inc
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2018                                |
+ | Copyright CiviCRM LLC (c) 2004-2019                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2018
+ * @copyright CiviCRM LLC (c) 2004-2019
  * $Id$
  *
  */
diff --git a/modules/civicrm_rules/civicrm_rules_utils.inc b/modules/civicrm_rules/civicrm_rules_utils.inc
index 5504b6b..f887adb 100644
--- a/modules/civicrm_rules/civicrm_rules_utils.inc
+++ b/modules/civicrm_rules/civicrm_rules_utils.inc
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2018                                |
+ | Copyright CiviCRM LLC (c) 2004-2019                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2018
+ * @copyright CiviCRM LLC (c) 2004-2019
  * $Id$
  *
  */
diff --git a/modules/civicrmtheme/civicrmtheme.install b/modules/civicrmtheme/civicrmtheme.install
index f8e609c..ffe5056 100644
--- a/modules/civicrmtheme/civicrmtheme.install
+++ b/modules/civicrmtheme/civicrmtheme.install
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2018                                |
+ | Copyright CiviCRM LLC (c) 2004-2019                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2018
+ * @copyright CiviCRM LLC (c) 2004-2019
  * $Id$
  *
  */
diff --git a/modules/civicrmtheme/civicrmtheme.module b/modules/civicrmtheme/civicrmtheme.module
index 7987c1d..3a180dc 100644
--- a/modules/civicrmtheme/civicrmtheme.module
+++ b/modules/civicrmtheme/civicrmtheme.module
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2018                                |
+ | Copyright CiviCRM LLC (c) 2004-2019                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2018
+ * @copyright CiviCRM LLC (c) 2004-2019
  * $Id$
  *
  */

From a94c7c47f1176b6514e48ec3c9351da8ecf87c0c Mon Sep 17 00:00:00 2001
From: Thomas <tmannell@rnao.ca>
Date: Fri, 31 Aug 2018 11:32:43 -0400
Subject: [PATCH 65/86] PHP 7.1 incompatibility error fix

---
 civicrm.module | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/civicrm.module b/civicrm.module
index 168413a..034dbd3 100644
--- a/civicrm.module
+++ b/civicrm.module
@@ -584,10 +584,10 @@ function civicrm_form_data($edit, &$user, $category, $reset, $doNotProcess = FAL
     // do not allow edit for anon users in joomla frontend, CRM-4668, unless u have checksum CRM-5228
     $config = CRM_Core_Config::singleton();
     if ($config->userFrameworkFrontend) {
-      CRM_Contact_BAO_Contact_Permission::validateOnlyChecksum($userID, $this);
+      CRM_Contact_BAO_Contact_Permission::validateOnlyChecksum($userID, $edit);
     }
     else {
-      CRM_Contact_BAO_Contact_Permission::validateChecksumContact($userID, $this);
+      CRM_Contact_BAO_Contact_Permission::validateChecksumContact($userID, $edit);
     }
   }
   $ctype = CRM_Core_DAO::getFieldValue('CRM_Contact_DAO_Contact', $userID, 'contact_type');

From 589f5251dd175107a9f37e54c14f4eb640969bd5 Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Wed, 23 Jan 2019 06:00:41 +1100
Subject: [PATCH 66/86] security/core#26 Add File Hash checing for file urls
 generated in Drupal Views

---
 .../views/civicrm/civicrm_handler_field_custom_file.inc    | 7 ++-----
 modules/views/civicrm/civicrm_handler_field_file.inc       | 7 ++-----
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/modules/views/civicrm/civicrm_handler_field_custom_file.inc b/modules/views/civicrm/civicrm_handler_field_custom_file.inc
index 6873d94..021f182 100644
--- a/modules/views/civicrm/civicrm_handler_field_custom_file.inc
+++ b/modules/views/civicrm/civicrm_handler_field_custom_file.inc
@@ -62,12 +62,9 @@ class civicrm_handler_field_custom_file extends views_handler_field {
         $path = sprintf('%s/imagefile', $path);
       }
       $entityField = $this->aliases['entity_id'];
-      $url = CRM_Utils_System::url($path,
-        "id={$value}&eid={$values->$entityField}",
-        TRUE, FALSE, FALSE, TRUE
-      );
+      $fileHash = CRM_Core_BAO_File::generateFileHash($values->$entityField, $value);
       return CRM_Utils_System::url($path,
-        "id={$value}&eid={$values->$entityField}",
+        "id={$value}&eid={$values->$entityField}&fcs={$fileHash}",
         TRUE, FALSE, FALSE, TRUE
       );
     }
diff --git a/modules/views/civicrm/civicrm_handler_field_file.inc b/modules/views/civicrm/civicrm_handler_field_file.inc
index 36cc32d..72c60e6 100644
--- a/modules/views/civicrm/civicrm_handler_field_file.inc
+++ b/modules/views/civicrm/civicrm_handler_field_file.inc
@@ -67,12 +67,9 @@ class civicrm_handler_field_custom_file extends views_handler_field {
       $file->set('mime-type', NULL);
 
       $entityField = $this->aliases['entity_id'];
-      $url = CRM_Utils_System::url($path,
-        "id={$value}&eid={$values->$entityField}",
-        TRUE, FALSE, FALSE, TRUE
-      );
+      $fileHash = CRM_Core_BAO_File::generateFileHash($values->$entityField, $value);
       return CRM_Utils_System::url($path,
-        "id={$value}&eid={$values->$entityField}",
+        "id={$value}&eid={$values->$entityField}&fcs={$fileHash}",
         TRUE, FALSE, FALSE, TRUE
       );
     }

From 743cc6e8c6990ab0c47721b80d9381e9519ec4aa Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Sat, 16 Feb 2019 12:38:15 +1100
Subject: [PATCH 67/86] Update the civicrm_handler_field_file to be about non
 custom fields and fix file generation

---
 .../civicrm/civicrm_handler_field_file.inc     | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/modules/views/civicrm/civicrm_handler_field_file.inc b/modules/views/civicrm/civicrm_handler_field_file.inc
index 72c60e6..23c4f0b 100644
--- a/modules/views/civicrm/civicrm_handler_field_file.inc
+++ b/modules/views/civicrm/civicrm_handler_field_file.inc
@@ -36,26 +36,29 @@
  *
  * @ingroup civicrm_field_handlers
  */
-class civicrm_handler_field_custom_file extends views_handler_field {
+class civicrm_handler_field_file extends views_handler_field {
   public function construct() {
     parent::construct();
     civicrm_initialize();
-    $this->additional_fields['entity_id'] = 'entity_id';
   }
 
   public function render($values) {
     $value = $values->{$this->field_alias};
-    if (!is_null($value)) {
+    $fileId = CRM_Core_DAO::singleValueQuery("SELECT file_id FROM civicrm_entity_file WHERE entity_id = %1 AND entity_table = %2", [
+      1 => [$value, 'Positive'],
+      2 => [$this->table_alias, 'String'],
+    ]);
+    if (!is_null($fileId)) {
       $path = 'civicrm/file';
       $fileType = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_File',
-        $value,
+        $fileId,
         'mime_type'
       );
 
       if ($fileType && in_array($fileType, array(
         "image/jpeg", "image/pjpeg", "image/gif", "image/x-png", "image/png"))) {
         $uri = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_File',
-          $value,
+          $fileId,
           'uri'
         );
 
@@ -66,10 +69,9 @@ class civicrm_handler_field_custom_file extends views_handler_field {
       $file->set('filename', NULL);
       $file->set('mime-type', NULL);
 
-      $entityField = $this->aliases['entity_id'];
-      $fileHash = CRM_Core_BAO_File::generateFileHash($values->$entityField, $value);
+      $fileHash = CRM_Core_BAO_File::generateFileHash($value, $fileId);
       return CRM_Utils_System::url($path,
-        "id={$value}&eid={$values->$entityField}&fcs={$fileHash}",
+        "id={$fileId}&eid={$value}&fcs={$fileHash}",
         TRUE, FALSE, FALSE, TRUE
       );
     }

From eb3ef97de934e882529d21ac6b58d064e1541bb0 Mon Sep 17 00:00:00 2001
From: colemanw <coleman@civicrm.org>
Date: Tue, 2 Apr 2019 10:19:53 -0400
Subject: [PATCH 68/86] Bump php version to match core requirements

---
 civicrm.info | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/civicrm.info b/civicrm.info
index a146ec8..c26c555 100644
--- a/civicrm.info
+++ b/civicrm.info
@@ -4,7 +4,7 @@ version = 7.x-4.7
 package = CiviCRM
 core = 7.x
 project = civicrm
-php = 5.3
+php = 5.6
 
 files[] = civicrm.module
 files[] = civicrm.install

From d1d2fed43e10b7ded426c57cfd67ae2b0cbb7428 Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Thu, 11 Apr 2019 13:45:25 +1000
Subject: [PATCH 69/86] Update 7.x Drupal code to be that of the new coder
 style

---
 modules/civicrm_engage/Engage/Report/Form/CallList.php | 1 +
 modules/civicrm_engage/Engage/Report/Form/List.php     | 2 ++
 modules/civicrm_engage/Engage/Report/Form/WalkList.php | 3 ++-
 tests/phpunit/CiviDrupal/HookTest.php                  | 1 +
 4 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/modules/civicrm_engage/Engage/Report/Form/CallList.php b/modules/civicrm_engage/Engage/Report/Form/CallList.php
index 426d133..d40aba9 100644
--- a/modules/civicrm_engage/Engage/Report/Form/CallList.php
+++ b/modules/civicrm_engage/Engage/Report/Form/CallList.php
@@ -40,6 +40,7 @@
  *  Generate a phone call list report
  */
 class Engage_Report_Form_CallList extends Engage_Report_Form_List {
+
   public function __construct() {
 
     parent::__construct();
diff --git a/modules/civicrm_engage/Engage/Report/Form/List.php b/modules/civicrm_engage/Engage/Report/Form/List.php
index de29227..a49193c 100644
--- a/modules/civicrm_engage/Engage/Report/Form/List.php
+++ b/modules/civicrm_engage/Engage/Report/Form/List.php
@@ -95,12 +95,14 @@ class Engage_Report_Form_List extends CRM_Report_Form {
    * Constituent individual table name has changed
    * between versions of civicrm. Populate this field
    * dynamically to ensure backward compatability
+   * @var bool
    */
   protected $_constituentIndividualTable = FALSE;
 
   /**
    * Langauage field might be primary or secondary
    * depending on version...
+   * @var bool
    */
   protected $_langaugeName = FALSE;
 
diff --git a/modules/civicrm_engage/Engage/Report/Form/WalkList.php b/modules/civicrm_engage/Engage/Report/Form/WalkList.php
index c2643b7..77afdb4 100644
--- a/modules/civicrm_engage/Engage/Report/Form/WalkList.php
+++ b/modules/civicrm_engage/Engage/Report/Form/WalkList.php
@@ -40,6 +40,7 @@
  *  Generate a walk list
  */
 class Engage_Report_Form_WalkList extends Engage_Report_Form_List {
+
   public function __construct() {
 
     parent::__construct();
@@ -435,7 +436,7 @@ public function executePrintmode($rows) {
       $dob  = $value['civicrm_contact_birth_date'];
       $age  = empty($dob) ? 0 : $this->dob2age($dob);
       if (!empty($value['civicrm_contact_gender_id'])) {
-        $sex  = $gender[CRM_Utils_Array::value('civicrm_contact_gender_id', $value)];
+        $sex = $gender[CRM_Utils_Array::value('civicrm_contact_gender_id', $value)];
       }
       $sex  = empty($sex) ? '' : $sex;
       $lang = strtoupper(substr($value[$this->_demoTable . '_' . $this->_demoLangCol], 0, 2));
diff --git a/tests/phpunit/CiviDrupal/HookTest.php b/tests/phpunit/CiviDrupal/HookTest.php
index 2542cf9..034863b 100644
--- a/tests/phpunit/CiviDrupal/HookTest.php
+++ b/tests/phpunit/CiviDrupal/HookTest.php
@@ -10,6 +10,7 @@
    * @group e2e
    */
   class HookTest extends \PHPUnit_Framework_TestCase implements EndToEndInterface {
+
     public function testFoo() {
       $arg1 = 'hello';
       $arg2 = array(

From c61e965e3728bc3dda64e1a333c2d5097250c5f5 Mon Sep 17 00:00:00 2001
From: Aidan Saunders <aidan.saunders@squiffle.uk>
Date: Thu, 11 Apr 2019 22:12:44 +0100
Subject: [PATCH 70/86] Enable contribution views to filter on empty Receipt
 and Thank You dates

---
 modules/views/components/civicrm.contribute.inc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/views/components/civicrm.contribute.inc b/modules/views/components/civicrm.contribute.inc
index cda1509..a9e32c7 100644
--- a/modules/views/components/civicrm.contribute.inc
+++ b/modules/views/components/civicrm.contribute.inc
@@ -404,6 +404,7 @@ function _civicrm_contribute_data(&$data, $enabled) {
     'filter' => array(
       'handler' => 'civicrm_handler_filter_datetime',
       'is date' => TRUE,
+      'allow empty' => TRUE,
     ),
     'sort' => array(
       'handler' => 'civicrm_handler_sort_date',
@@ -425,6 +426,7 @@ function _civicrm_contribute_data(&$data, $enabled) {
     'filter' => array(
       'handler' => 'civicrm_handler_filter_datetime',
       'is date' => TRUE,
+      'allow empty' => TRUE,
     ),
     'sort' => array(
       'handler' => 'civicrm_handler_sort_date',

From ee5ffc498d6c8cd2c369c2a85a57b3555499df5d Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Fri, 12 Apr 2019 07:54:47 +1000
Subject: [PATCH 71/86] Lint .inc files in Drupal module folder to match newer
 coder standard

---
 drush/civicrm.drush.inc                       |  5 +--
 .../civicrm_engage/civicrm_engage.admin.inc   |  2 +-
 .../civicrm_member_roles.drush.inc            |  1 +
 .../civicrm_rules.contact-eval.inc            |  6 ++-
 .../civicrm_rules.event-eval.inc              |  1 +
 .../civicrm_rules.mailing-eval.inc            |  8 ++--
 .../civicrm_rules_admin_form.inc              |  1 +
 .../civicrm_rules/civicrm_rules_condition.inc |  6 ++-
 modules/civicrm_rules/civicrm_rules_utils.inc |  1 -
 .../civicrm_handler_field_activity.inc        |  3 +-
 .../civicrm_handler_field_component.inc       |  1 +
 .../civicrm_handler_field_contact_image.inc   |  1 +
 .../civicrm/civicrm_handler_field_country.inc |  5 ++-
 .../civicrm/civicrm_handler_field_county.inc  |  3 +-
 .../civicrm/civicrm_handler_field_custom.inc  |  1 +
 .../civicrm_handler_field_custom_file.inc     |  4 +-
 .../civicrm_handler_field_drupalid.inc        |  1 +
 .../civicrm/civicrm_handler_field_email.inc   |  1 +
 ...civicrm_handler_field_encounter_medium.inc |  3 +-
 .../civicrm/civicrm_handler_field_file.inc    |  4 +-
 .../civicrm/civicrm_handler_field_im.inc      |  2 +-
 .../civicrm/civicrm_handler_field_link.inc    |  1 +
 .../civicrm_handler_field_link_edit.inc       |  1 +
 .../civicrm_handler_field_location.inc        |  6 +--
 .../civicrm/civicrm_handler_field_mail.inc    |  1 +
 .../civicrm/civicrm_handler_field_markup.inc  |  1 +
 .../civicrm/civicrm_handler_field_money.inc   |  1 +
 .../civicrm/civicrm_handler_field_option.inc  |  3 +-
 ...ivicrm_handler_field_pcp_raised_amount.inc |  1 +
 .../civicrm/civicrm_handler_field_phone.inc   |  2 +-
 .../civicrm_handler_field_pseudo_constant.inc |  3 +-
 ...ivicrm_handler_field_relationship_type.inc |  3 +-
 .../civicrm/civicrm_handler_field_state.inc   |  5 ++-
 .../civicrm/civicrm_handler_field_website.inc |  2 +-
 .../civicrm_handler_filter_contact_ref.inc    |  3 ++
 .../civicrm_handler_filter_country_multi.inc  |  1 +
 .../civicrm_handler_filter_custom_option.inc  |  1 +
 ...rm_handler_filter_custom_single_option.inc |  1 +
 .../civicrm/civicrm_handler_filter_domain.inc |  1 +
 ...ivicrm_handler_filter_encounter_medium.inc |  3 +-
 .../civicrm_handler_filter_group_status.inc   |  3 +-
 .../civicrm/civicrm_handler_filter_option.inc |  3 +-
 ...civicrm_handler_filter_pseudo_constant.inc |  1 +
 ...vicrm_handler_filter_relationship_type.inc |  3 +-
 .../civicrm_handler_filter_state_multi.inc    |  1 +
 .../civicrm/civicrm_handler_relationship.inc  |  2 +-
 .../civicrm_handler_relationship_address.inc  |  1 -
 .../civicrm_handler_relationship_im.inc       |  3 +-
 .../civicrm_handler_relationship_location.inc |  7 ++-
 ...vicrm_handler_relationship_participant.inc |  2 +-
 .../civicrm_handler_relationship_phone.inc    |  3 +-
 ...icrm_handler_relationship_relationship.inc |  2 +-
 .../civicrm_handler_relationship_website.inc  |  3 +-
 ...civicrm_handler_sort_pcp_raised_amount.inc |  1 +
 .../civicrm_plugin_argument_default.inc       |  3 +-
 modules/views/components/civicrm.campaign.inc |  9 ++--
 modules/views/components/civicrm.case.inc     |  8 ++--
 .../views/components/civicrm.contribute.inc   | 44 +++++++++----------
 modules/views/components/civicrm.core.inc     |  3 +-
 modules/views/components/civicrm.event.inc    | 20 ++++-----
 modules/views/components/civicrm.mail.inc     | 20 ++++-----
 modules/views/components/civicrm.member.inc   | 16 +++----
 .../plugins/calendar_plugin_row_civicrm.inc   | 13 ++++--
 .../calendar_plugin_row_civicrm_event.inc     | 19 +++++---
 64 files changed, 175 insertions(+), 115 deletions(-)

diff --git a/drush/civicrm.drush.inc b/drush/civicrm.drush.inc
index 394b6b4..39aac0e 100644
--- a/drush/civicrm.drush.inc
+++ b/drush/civicrm.drush.inc
@@ -306,7 +306,6 @@ function drush_civicrm_install_validate() {
   return TRUE;
 }
 
-
 /**
  * Implementation of command 'civicrm-install'
  */
@@ -718,7 +717,8 @@ function drush_civicrm_upgrade_db() {
 
     // new since CiviCRM 4.1
     if (is_callable(array(
-      $upgrade, 'setPrint'))) {
+      $upgrade, 'setPrint',
+    ))) {
       $upgrade->setPrint(TRUE);
     }
 
@@ -739,7 +739,6 @@ function drush_civicrm_update_cfg_validate() {
   return _civicrm_init();
 }
 
-
 /**
  * Implementation of command 'civicrm-update-cfg'
  */
diff --git a/modules/civicrm_engage/civicrm_engage.admin.inc b/modules/civicrm_engage/civicrm_engage.admin.inc
index 7a15025..580cbd0 100644
--- a/modules/civicrm_engage/civicrm_engage.admin.inc
+++ b/modules/civicrm_engage/civicrm_engage.admin.inc
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * http://pastebin.com/U32jjBVu - D7 has renamed admin settings
  */
@@ -129,7 +130,6 @@ function civicrm_engage_admin_load_data($form_state = NULL) {
   return $form;
 }
 
-
 function civicrm_engage_admin_load_data_submit($form, &$form_state) {
   if ($form_state['values']['contact_subtypes'] == 1) {
     civicrm_engage_load_contact_subtypes();
diff --git a/modules/civicrm_member_roles/civicrm_member_roles.drush.inc b/modules/civicrm_member_roles/civicrm_member_roles.drush.inc
index a8f96ae..1d36644 100644
--- a/modules/civicrm_member_roles/civicrm_member_roles.drush.inc
+++ b/modules/civicrm_member_roles/civicrm_member_roles.drush.inc
@@ -30,6 +30,7 @@ function civicrm_member_roles_drush_command() {
   );
   return $items;
 }
+
 /**
  * (Drush callback)
  *
diff --git a/modules/civicrm_rules/civicrm_rules.contact-eval.inc b/modules/civicrm_rules/civicrm_rules.contact-eval.inc
index c6c14b1..fee5174 100644
--- a/modules/civicrm_rules/civicrm_rules.contact-eval.inc
+++ b/modules/civicrm_rules/civicrm_rules.contact-eval.inc
@@ -41,7 +41,8 @@
  * @{
  */
 require_once 'civicrm_rules_utils.inc';
-function civicrm_rules_rules_action_contact_send_email($to, $subject, $message, $from = NULL, $settings, RulesState$state, RulesPlugin$element) {
+
+function civicrm_rules_rules_action_contact_send_email($to, $subject, $message, $from = NULL, $settings, RulesState $state, RulesPlugin $element) {
 
   $to = str_replace(array("\r", "\n"), ',', $to);
   $toEmails = explode(',', $to);
@@ -51,7 +52,8 @@ function civicrm_rules_rules_action_contact_send_email($to, $subject, $message,
   foreach ($toEmails as $toEmail) {
     $params            = array();
     $params['from']    = !empty($from) ? str_replace(array(
-      "\r", "\n"), '', $from) : 'Admin';
+      "\r", "\n",
+    ), '', $from) : 'Admin';
     $params['toEmail'] = $toEmail;
     $params['subject'] = $subject;
     $params['text']    = is_array($message) ? implode("\n", $message) : $message;
diff --git a/modules/civicrm_rules/civicrm_rules.event-eval.inc b/modules/civicrm_rules/civicrm_rules.event-eval.inc
index 659f81d..43ee68a 100644
--- a/modules/civicrm_rules/civicrm_rules.event-eval.inc
+++ b/modules/civicrm_rules/civicrm_rules.event-eval.inc
@@ -34,6 +34,7 @@
  */
 
 require_once 'civicrm_rules_utils.inc';
+
 function civicrm_rules_condition_event_node(&$entityobj, $roleID, $field) {
   //just a hack for our site
   //SELECT * FROM `content_type_og_node` WHERE `field_civicrm_event_value` =993
diff --git a/modules/civicrm_rules/civicrm_rules.mailing-eval.inc b/modules/civicrm_rules/civicrm_rules.mailing-eval.inc
index d385c39..f230ab1 100644
--- a/modules/civicrm_rules/civicrm_rules.mailing-eval.inc
+++ b/modules/civicrm_rules/civicrm_rules.mailing-eval.inc
@@ -34,13 +34,14 @@
  */
 
 require_once 'civicrm_rules_utils.inc';
+
 function civicrm_rules_rules_action_mailing_send_email($to,
   $subject,
   $message,
   $from = NULL,
   $settings,
-  RulesState$state,
-  RulesPlugin$element
+  RulesState $state,
+  RulesPlugin $element
 ) {
   if (isset($state->variables['mailing']) && $state->variables['mailing']->id) {
     $to = str_replace(array("\r", "\n"), ',', $to);
@@ -59,7 +60,8 @@ function civicrm_rules_rules_action_mailing_send_email($to,
 
     $params            = array();
     $params['from']    = !empty($from) ? str_replace(array(
-      "\r", "\n"), '', $from) : 'Admin';
+      "\r", "\n",
+    ), '', $from) : 'Admin';
     $params['subject'] = CRM_Utils_Token::replaceMailingTokens($subject, $state->variables['mailing'], NULL, $tokens);
     $params['html']    = CRM_Utils_Token::replaceMailingTokens($message, $state->variables['mailing'], NULL, $tokens);
 
diff --git a/modules/civicrm_rules/civicrm_rules_admin_form.inc b/modules/civicrm_rules/civicrm_rules_admin_form.inc
index 5a91b57..6da848e 100644
--- a/modules/civicrm_rules/civicrm_rules_admin_form.inc
+++ b/modules/civicrm_rules/civicrm_rules_admin_form.inc
@@ -1,4 +1,5 @@
 <?php
+
 function civicrm_rules_admin_settings($form_state = NULL) {
 
   $form['civicrm_rules_post_entities'] = array(
diff --git a/modules/civicrm_rules/civicrm_rules_condition.inc b/modules/civicrm_rules/civicrm_rules_condition.inc
index 4b956f9..00ecc37 100644
--- a/modules/civicrm_rules/civicrm_rules_condition.inc
+++ b/modules/civicrm_rules/civicrm_rules_condition.inc
@@ -85,7 +85,8 @@ function civicrm_rules_condition_parameter($label, $type = 'contact') {
         'type' => 'list<integer>',
         'label' => t('Participant role'),
         'options list' => 'civicrm_rules_get_participant_role_options',
-      ));
+      ),
+    );
   }
 
   if ($type == 'event') {
@@ -94,7 +95,8 @@ function civicrm_rules_condition_parameter($label, $type = 'contact') {
         'type' => 'list<integer>',
         'label' => t('CiviCRM event type'),
         'options list' => 'civicrm_rules_get_event_type_options',
-      ));
+      ),
+    );
   }
 
   return $default;
diff --git a/modules/civicrm_rules/civicrm_rules_utils.inc b/modules/civicrm_rules/civicrm_rules_utils.inc
index f887adb..37a2737 100644
--- a/modules/civicrm_rules/civicrm_rules_utils.inc
+++ b/modules/civicrm_rules/civicrm_rules_utils.inc
@@ -136,7 +136,6 @@ function _civicrm_rules_load_mailing($mailingID) {
   return $mailing;
 }
 
-
 /**
  * function to return labels for checkboxes & stuff
  */
diff --git a/modules/views/civicrm/civicrm_handler_field_activity.inc b/modules/views/civicrm/civicrm_handler_field_activity.inc
index c376ffd..6cd4aeb 100644
--- a/modules/views/civicrm/civicrm_handler_field_activity.inc
+++ b/modules/views/civicrm/civicrm_handler_field_activity.inc
@@ -29,7 +29,8 @@
  * @ingroup civicrm_field_handlers
  */
 class civicrm_handler_field_activity extends civicrm_handler_field {
-  static $_recordType;
+  public static $_recordType;
+
   public function construct() {
     parent::construct();
     if (!self::$_recordType) {
diff --git a/modules/views/civicrm/civicrm_handler_field_component.inc b/modules/views/civicrm/civicrm_handler_field_component.inc
index 8f2a265..c593827 100644
--- a/modules/views/civicrm/civicrm_handler_field_component.inc
+++ b/modules/views/civicrm/civicrm_handler_field_component.inc
@@ -29,6 +29,7 @@
  * @ingroup civicrm_field_handlers
  */
 class civicrm_handler_field_component extends views_handler_field {
+
   public function render($values) {
     $value = $this->get_value($values);
     return CRM_Core_Component::getComponentName($value);
diff --git a/modules/views/civicrm/civicrm_handler_field_contact_image.inc b/modules/views/civicrm/civicrm_handler_field_contact_image.inc
index dffe741..ff161fd 100644
--- a/modules/views/civicrm/civicrm_handler_field_contact_image.inc
+++ b/modules/views/civicrm/civicrm_handler_field_contact_image.inc
@@ -1,6 +1,7 @@
 <?php
 
 class civicrm_handler_field_contact_image extends views_handler_field {
+
   public function option_definition() {
     $options = parent::option_definition();
     $options['url_only'] = array(
diff --git a/modules/views/civicrm/civicrm_handler_field_country.inc b/modules/views/civicrm/civicrm_handler_field_country.inc
index 2645e90..d70ae52 100644
--- a/modules/views/civicrm/civicrm_handler_field_country.inc
+++ b/modules/views/civicrm/civicrm_handler_field_country.inc
@@ -32,8 +32,9 @@
  *
  */
 class civicrm_handler_field_country extends civicrm_handler_field_address {
-  static $_countries;
-  static $_countries_full;
+  public static $_countries;
+  public static $_countries_full;
+
   public function construct() {
     parent::construct();
     if (!self::$_countries) {
diff --git a/modules/views/civicrm/civicrm_handler_field_county.inc b/modules/views/civicrm/civicrm_handler_field_county.inc
index 7cc73be..2958952 100644
--- a/modules/views/civicrm/civicrm_handler_field_county.inc
+++ b/modules/views/civicrm/civicrm_handler_field_county.inc
@@ -30,7 +30,8 @@
  *
  */
 class civicrm_handler_field_county extends civicrm_handler_field_address {
-  static $_counties;
+  public static $_counties;
+
   public function construct() {
     parent::construct();
     if (!self::$_counties) {
diff --git a/modules/views/civicrm/civicrm_handler_field_custom.inc b/modules/views/civicrm/civicrm_handler_field_custom.inc
index a0c032e..bc3a0e6 100644
--- a/modules/views/civicrm/civicrm_handler_field_custom.inc
+++ b/modules/views/civicrm/civicrm_handler_field_custom.inc
@@ -29,6 +29,7 @@
  * @ingroup civicrm_field_handlers
  */
 class civicrm_handler_field_custom extends views_handler_field {
+
   public function construct() {
     parent::construct();
     civicrm_initialize();
diff --git a/modules/views/civicrm/civicrm_handler_field_custom_file.inc b/modules/views/civicrm/civicrm_handler_field_custom_file.inc
index 021f182..8d1f588 100644
--- a/modules/views/civicrm/civicrm_handler_field_custom_file.inc
+++ b/modules/views/civicrm/civicrm_handler_field_custom_file.inc
@@ -37,6 +37,7 @@
  * @ingroup civicrm_field_handlers
  */
 class civicrm_handler_field_custom_file extends views_handler_field {
+
   public function construct() {
     parent::construct();
     civicrm_initialize();
@@ -53,7 +54,8 @@ class civicrm_handler_field_custom_file extends views_handler_field {
       );
 
       if ($fileType && in_array($fileType, array(
-        "image/jpeg", "image/pjpeg", "image/gif", "image/x-png", "image/png"))) {
+        "image/jpeg", "image/pjpeg", "image/gif", "image/x-png", "image/png",
+      ))) {
         $uri = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_File',
           $value,
           'uri'
diff --git a/modules/views/civicrm/civicrm_handler_field_drupalid.inc b/modules/views/civicrm/civicrm_handler_field_drupalid.inc
index 84cdb68..66e1fb5 100644
--- a/modules/views/civicrm/civicrm_handler_field_drupalid.inc
+++ b/modules/views/civicrm/civicrm_handler_field_drupalid.inc
@@ -29,6 +29,7 @@
  * @ingroup civicrm_field_handlers
  */
 class civicrm_handler_field_drupalid extends views_handler_field {
+
   public function construct() {
     parent::construct();
     if (!civicrm_initialize()) {
diff --git a/modules/views/civicrm/civicrm_handler_field_email.inc b/modules/views/civicrm/civicrm_handler_field_email.inc
index 878ec31..18d7ccb 100644
--- a/modules/views/civicrm/civicrm_handler_field_email.inc
+++ b/modules/views/civicrm/civicrm_handler_field_email.inc
@@ -37,6 +37,7 @@
  * @ingroup civicrm_field_handlers
  */
 class civicrm_handler_field_email extends civicrm_handler_field_location {
+
   public function option_definition() {
     $options = parent::option_definition();
     $options['link_to_user'] = array('default' => 'mailto');
diff --git a/modules/views/civicrm/civicrm_handler_field_encounter_medium.inc b/modules/views/civicrm/civicrm_handler_field_encounter_medium.inc
index 1160c76..05f522c 100644
--- a/modules/views/civicrm/civicrm_handler_field_encounter_medium.inc
+++ b/modules/views/civicrm/civicrm_handler_field_encounter_medium.inc
@@ -31,7 +31,8 @@
  *
  */
 class civicrm_handler_field_encounter_medium extends views_handler_field {
-  static $_encounter_medium;
+  public static $_encounter_medium;
+
   public function construct() {
     parent::construct();
     if (!self::$_encounter_medium) {
diff --git a/modules/views/civicrm/civicrm_handler_field_file.inc b/modules/views/civicrm/civicrm_handler_field_file.inc
index 23c4f0b..9832b7b 100644
--- a/modules/views/civicrm/civicrm_handler_field_file.inc
+++ b/modules/views/civicrm/civicrm_handler_field_file.inc
@@ -37,6 +37,7 @@
  * @ingroup civicrm_field_handlers
  */
 class civicrm_handler_field_file extends views_handler_field {
+
   public function construct() {
     parent::construct();
     civicrm_initialize();
@@ -56,7 +57,8 @@ class civicrm_handler_field_file extends views_handler_field {
       );
 
       if ($fileType && in_array($fileType, array(
-        "image/jpeg", "image/pjpeg", "image/gif", "image/x-png", "image/png"))) {
+        "image/jpeg", "image/pjpeg", "image/gif", "image/x-png", "image/png",
+      ))) {
         $uri = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_File',
           $fileId,
           'uri'
diff --git a/modules/views/civicrm/civicrm_handler_field_im.inc b/modules/views/civicrm/civicrm_handler_field_im.inc
index 98cc949..ce2747e 100644
--- a/modules/views/civicrm/civicrm_handler_field_im.inc
+++ b/modules/views/civicrm/civicrm_handler_field_im.inc
@@ -29,7 +29,7 @@
  * @ingroup civicrm_field_handlers
  */
 class civicrm_handler_field_im extends civicrm_handler_field_location {
-  static $_provider;
+  public static $_provider;
 
   public function construct() {
     parent::construct();
diff --git a/modules/views/civicrm/civicrm_handler_field_link.inc b/modules/views/civicrm/civicrm_handler_field_link.inc
index b137bca..e698cd5 100644
--- a/modules/views/civicrm/civicrm_handler_field_link.inc
+++ b/modules/views/civicrm/civicrm_handler_field_link.inc
@@ -29,6 +29,7 @@
  * @ingroup civicrm_field_handlers
  */
 class civicrm_handler_field_link extends civicrm_handler_field {
+
   public function construct() {
     parent::construct();
     $this->additional_fields['id'] = 'id';
diff --git a/modules/views/civicrm/civicrm_handler_field_link_edit.inc b/modules/views/civicrm/civicrm_handler_field_link_edit.inc
index 4271cf8..8c0df9c 100644
--- a/modules/views/civicrm/civicrm_handler_field_link_edit.inc
+++ b/modules/views/civicrm/civicrm_handler_field_link_edit.inc
@@ -29,6 +29,7 @@
  * @ingroup civicrm_field_handlers
  */
 class civicrm_handler_field_link_edit extends civicrm_handler_field_link {
+
   /**
    * An example of field level access control.
    */
diff --git a/modules/views/civicrm/civicrm_handler_field_location.inc b/modules/views/civicrm/civicrm_handler_field_location.inc
index 2847a8c..0b66e1f 100644
--- a/modules/views/civicrm/civicrm_handler_field_location.inc
+++ b/modules/views/civicrm/civicrm_handler_field_location.inc
@@ -29,9 +29,9 @@
  * @ingroup civicrm_field_handlers
  */
 class civicrm_handler_field_location extends civicrm_handler_field {
-  static $_locationTypes;
-  static $_locationOps;
-  static $location_op;
+  public static $_locationTypes;
+  public static $_locationOps;
+  public static $location_op;
 
   public function construct() {
     parent::construct();
diff --git a/modules/views/civicrm/civicrm_handler_field_mail.inc b/modules/views/civicrm/civicrm_handler_field_mail.inc
index ac8473e..77ba94c 100644
--- a/modules/views/civicrm/civicrm_handler_field_mail.inc
+++ b/modules/views/civicrm/civicrm_handler_field_mail.inc
@@ -29,6 +29,7 @@
  * @ingroup civicrm_field_handlers
  */
 class civicrm_handler_field_mail extends civicrm_handler_field {
+
   public function option_definition() {
     $options = parent::option_definition();
     $options['link_to_civicrm'] = array('default' => 'mailto');
diff --git a/modules/views/civicrm/civicrm_handler_field_markup.inc b/modules/views/civicrm/civicrm_handler_field_markup.inc
index 7e71b7c..7e033aa 100644
--- a/modules/views/civicrm/civicrm_handler_field_markup.inc
+++ b/modules/views/civicrm/civicrm_handler_field_markup.inc
@@ -5,6 +5,7 @@
  *
  */
 class civicrm_handler_field_markup extends views_handler_field {
+
   public function option_definition() {
     $options = parent::option_definition();
 
diff --git a/modules/views/civicrm/civicrm_handler_field_money.inc b/modules/views/civicrm/civicrm_handler_field_money.inc
index 80ba29f..e13bfff 100644
--- a/modules/views/civicrm/civicrm_handler_field_money.inc
+++ b/modules/views/civicrm/civicrm_handler_field_money.inc
@@ -29,6 +29,7 @@
  * @ingroup civicrm_field_handlers
  */
 class civicrm_handler_field_money extends views_handler_field {
+
   public function construct() {
     parent::construct();
     if (!civicrm_initialize()) {
diff --git a/modules/views/civicrm/civicrm_handler_field_option.inc b/modules/views/civicrm/civicrm_handler_field_option.inc
index 6d99c50..530f852 100644
--- a/modules/views/civicrm/civicrm_handler_field_option.inc
+++ b/modules/views/civicrm/civicrm_handler_field_option.inc
@@ -29,7 +29,8 @@
  * @ingroup civicrm_field_handlers
  */
 class civicrm_handler_field_option extends civicrm_handler_field {
-  static $_options;
+  public static $_options;
+
   public function render($values) {
     $this->initialize();
 
diff --git a/modules/views/civicrm/civicrm_handler_field_pcp_raised_amount.inc b/modules/views/civicrm/civicrm_handler_field_pcp_raised_amount.inc
index 71d8185..c474131 100644
--- a/modules/views/civicrm/civicrm_handler_field_pcp_raised_amount.inc
+++ b/modules/views/civicrm/civicrm_handler_field_pcp_raised_amount.inc
@@ -29,6 +29,7 @@
  * @ingroup civicrm_field_handlers
  */
 class civicrm_handler_field_pcp_raised_amount extends views_handler_field {
+
   public function construct() {
     parent::construct();
     if (!civicrm_initialize()) {
diff --git a/modules/views/civicrm/civicrm_handler_field_phone.inc b/modules/views/civicrm/civicrm_handler_field_phone.inc
index 32a3e93..24e17d9 100644
--- a/modules/views/civicrm/civicrm_handler_field_phone.inc
+++ b/modules/views/civicrm/civicrm_handler_field_phone.inc
@@ -29,7 +29,7 @@
  * @ingroup civicrm_field_handlers
  */
 class civicrm_handler_field_phone extends civicrm_handler_field_location {
-  static $_phoneType;
+  public static $_phoneType;
 
   public function construct() {
     parent::construct();
diff --git a/modules/views/civicrm/civicrm_handler_field_pseudo_constant.inc b/modules/views/civicrm/civicrm_handler_field_pseudo_constant.inc
index 6e3d24e..61c27ef 100644
--- a/modules/views/civicrm/civicrm_handler_field_pseudo_constant.inc
+++ b/modules/views/civicrm/civicrm_handler_field_pseudo_constant.inc
@@ -61,7 +61,8 @@ class civicrm_handler_field_pseudo_constant extends views_handler_field {
   public function render($values) {
     if (!empty($values->{$this->field_alias})) {
       $val = $values->{$this->field_alias};
-      $val = str_replace("\x01", '', $val); // TODO This fix should be replaced as described in  CRM-12853
+      // TODO This fix should be replaced as described in  CRM-12853
+      $val = str_replace("\x01", '', $val);
       return $this->_pseudo_constant[$val];
     }
   }
diff --git a/modules/views/civicrm/civicrm_handler_field_relationship_type.inc b/modules/views/civicrm/civicrm_handler_field_relationship_type.inc
index 58a7565..28f5b3f 100644
--- a/modules/views/civicrm/civicrm_handler_field_relationship_type.inc
+++ b/modules/views/civicrm/civicrm_handler_field_relationship_type.inc
@@ -31,7 +31,8 @@
  *
  */
 class civicrm_handler_field_relationship_type extends views_handler_field {
-  static $_relationshipType;
+  public static $_relationshipType;
+
   public function construct() {
     parent::construct();
     if (!self::$_relationshipType) {
diff --git a/modules/views/civicrm/civicrm_handler_field_state.inc b/modules/views/civicrm/civicrm_handler_field_state.inc
index 234111f..7868ccc 100644
--- a/modules/views/civicrm/civicrm_handler_field_state.inc
+++ b/modules/views/civicrm/civicrm_handler_field_state.inc
@@ -29,8 +29,9 @@
  * @ingroup civicrm_field_handlers
  */
 class civicrm_handler_field_state extends civicrm_handler_field_address {
-  static $_states;
-  static $_states_full;
+  public static $_states;
+  public static $_states_full;
+
   public function construct() {
     parent::construct();
     if (!self::$_states || !self::$_states_full) {
diff --git a/modules/views/civicrm/civicrm_handler_field_website.inc b/modules/views/civicrm/civicrm_handler_field_website.inc
index 706c6c1..5097c09 100644
--- a/modules/views/civicrm/civicrm_handler_field_website.inc
+++ b/modules/views/civicrm/civicrm_handler_field_website.inc
@@ -29,7 +29,7 @@
  * @ingroup civicrm_field_handlers
  */
 class civicrm_handler_field_website extends civicrm_handler_field {
-  static $_websiteType;
+  public static $_websiteType;
 
   public function construct() {
     parent::construct();
diff --git a/modules/views/civicrm/civicrm_handler_filter_contact_ref.inc b/modules/views/civicrm/civicrm_handler_filter_contact_ref.inc
index 83e27c8..a8a26ef 100644
--- a/modules/views/civicrm/civicrm_handler_filter_contact_ref.inc
+++ b/modules/views/civicrm/civicrm_handler_filter_contact_ref.inc
@@ -27,15 +27,18 @@
  * Filters Contact reference custom field.
  */
 class civicrm_handler_filter_contact_ref extends views_handler_filter_string {
+
   public function construct() {
     parent::construct();
     if (!civicrm_initialize()) {
       return;
     }
   }
+
   public function op_equal($field) {
     $this->filterContactRef($field);
   }
+
   public function op_contains($field) {
     $this->filterContactRef($field);
   }
diff --git a/modules/views/civicrm/civicrm_handler_filter_country_multi.inc b/modules/views/civicrm/civicrm_handler_filter_country_multi.inc
index 65949b2..3fdec00 100644
--- a/modules/views/civicrm/civicrm_handler_filter_country_multi.inc
+++ b/modules/views/civicrm/civicrm_handler_filter_country_multi.inc
@@ -30,6 +30,7 @@
  * based on civicrm_handler_filter_custom_option and civicrm_handler_filter_country
  */
 class civicrm_handler_filter_country_multi extends views_handler_filter_in_operator {
+
   public function construct() {
     parent::construct();
     if (!civicrm_initialize()) {
diff --git a/modules/views/civicrm/civicrm_handler_filter_custom_option.inc b/modules/views/civicrm/civicrm_handler_filter_custom_option.inc
index b7a0ac3..a755027 100644
--- a/modules/views/civicrm/civicrm_handler_filter_custom_option.inc
+++ b/modules/views/civicrm/civicrm_handler_filter_custom_option.inc
@@ -30,6 +30,7 @@
  * @author Matt Chapman <Matt@NinjitsuWeb.com>
  */
 class civicrm_handler_filter_custom_option extends views_handler_filter_in_operator {
+
   public function construct() {
     parent::construct();
     if (!civicrm_initialize()) {
diff --git a/modules/views/civicrm/civicrm_handler_filter_custom_single_option.inc b/modules/views/civicrm/civicrm_handler_filter_custom_single_option.inc
index ea5a5b1..191d630 100644
--- a/modules/views/civicrm/civicrm_handler_filter_custom_single_option.inc
+++ b/modules/views/civicrm/civicrm_handler_filter_custom_single_option.inc
@@ -29,6 +29,7 @@
   * @author Matt Chapman <Matt@NinjitsuWeb.com>
   */
 class civicrm_handler_filter_custom_single_option extends views_handler_filter_in_operator {
+
   public function construct() {
     parent::construct();
     if (!civicrm_initialize()) {
diff --git a/modules/views/civicrm/civicrm_handler_filter_domain.inc b/modules/views/civicrm/civicrm_handler_filter_domain.inc
index 455dbe5..7e6a376 100644
--- a/modules/views/civicrm/civicrm_handler_filter_domain.inc
+++ b/modules/views/civicrm/civicrm_handler_filter_domain.inc
@@ -27,6 +27,7 @@
  * Field hanlder to allow filtering by CiviCRM domain.
  */
 class civicrm_handler_filter_domain extends views_handler_filter_numeric {
+
   /**
    * Add an additonal operator which takes no arguments to the existing list provided by views_handler_filter_numeric.
    */
diff --git a/modules/views/civicrm/civicrm_handler_filter_encounter_medium.inc b/modules/views/civicrm/civicrm_handler_filter_encounter_medium.inc
index 413c8b0..59c64ba 100644
--- a/modules/views/civicrm/civicrm_handler_filter_encounter_medium.inc
+++ b/modules/views/civicrm/civicrm_handler_filter_encounter_medium.inc
@@ -33,7 +33,8 @@
  *
  */
 class civicrm_handler_filter_encounter_medium extends views_handler_filter_in_operator {
-  static $_encounter_medium;
+  public static $_encounter_medium;
+
   public function construct() {
     parent::construct();
     if (!self::$_encounter_medium) {
diff --git a/modules/views/civicrm/civicrm_handler_filter_group_status.inc b/modules/views/civicrm/civicrm_handler_filter_group_status.inc
index e3935d7..6ca323e 100644
--- a/modules/views/civicrm/civicrm_handler_filter_group_status.inc
+++ b/modules/views/civicrm/civicrm_handler_filter_group_status.inc
@@ -30,7 +30,8 @@
  */
 class civicrm_handler_filter_group_status extends views_handler_filter_in_operator {
 
-  static $groupContactStatus = NULL;
+  public static $groupContactStatus = NULL;
+
   public function construct() {
     parent::construct();
 
diff --git a/modules/views/civicrm/civicrm_handler_filter_option.inc b/modules/views/civicrm/civicrm_handler_filter_option.inc
index ee346bc..d408415 100644
--- a/modules/views/civicrm/civicrm_handler_filter_option.inc
+++ b/modules/views/civicrm/civicrm_handler_filter_option.inc
@@ -27,7 +27,8 @@
  * CiviCRM handler for options with the in operator.
  */
 class civicrm_handler_filter_option extends views_handler_filter_in_operator {
-  static $_options;
+  public static $_options;
+
   public function get_value_options() {
     $this->initialize();
 
diff --git a/modules/views/civicrm/civicrm_handler_filter_pseudo_constant.inc b/modules/views/civicrm/civicrm_handler_filter_pseudo_constant.inc
index 8ef9c7f..cf5f749 100644
--- a/modules/views/civicrm/civicrm_handler_filter_pseudo_constant.inc
+++ b/modules/views/civicrm/civicrm_handler_filter_pseudo_constant.inc
@@ -33,6 +33,7 @@
  */
 class civicrm_handler_filter_pseudo_constant extends views_handler_filter_in_operator {
   public $_pseudo_constant;
+
   public function construct() {
     parent::construct();
     if (!civicrm_initialize() ||
diff --git a/modules/views/civicrm/civicrm_handler_filter_relationship_type.inc b/modules/views/civicrm/civicrm_handler_filter_relationship_type.inc
index 66588e7..821bf81 100644
--- a/modules/views/civicrm/civicrm_handler_filter_relationship_type.inc
+++ b/modules/views/civicrm/civicrm_handler_filter_relationship_type.inc
@@ -32,7 +32,8 @@
  *
  */
 class civicrm_handler_filter_relationship_type extends views_handler_filter_in_operator {
-  static $_relationshipType;
+  public static $_relationshipType;
+
   public function construct() {
     parent::construct();
     if (!self::$_relationshipType) {
diff --git a/modules/views/civicrm/civicrm_handler_filter_state_multi.inc b/modules/views/civicrm/civicrm_handler_filter_state_multi.inc
index 854c126..1821db1 100644
--- a/modules/views/civicrm/civicrm_handler_filter_state_multi.inc
+++ b/modules/views/civicrm/civicrm_handler_filter_state_multi.inc
@@ -30,6 +30,7 @@
  * based on civicrm_handler_filter_custom_option and civicrm_handler_filter_state
  */
 class civicrm_handler_filter_state_multi extends views_handler_filter_in_operator {
+
   public function construct() {
     parent::construct();
     if (!civicrm_initialize()) {
diff --git a/modules/views/civicrm/civicrm_handler_relationship.inc b/modules/views/civicrm/civicrm_handler_relationship.inc
index 7b4f5ea..307f12e 100644
--- a/modules/views/civicrm/civicrm_handler_relationship.inc
+++ b/modules/views/civicrm/civicrm_handler_relationship.inc
@@ -34,7 +34,7 @@
  *   the relationship.
  */
 class civicrm_handler_relationship extends views_handler_relationship {
-  static $_relationshipType;
+  public static $_relationshipType;
 
   /**
    * Init handler to let relationships live on tables other than
diff --git a/modules/views/civicrm/civicrm_handler_relationship_address.inc b/modules/views/civicrm/civicrm_handler_relationship_address.inc
index 02a675f..7a8d74e 100644
--- a/modules/views/civicrm/civicrm_handler_relationship_address.inc
+++ b/modules/views/civicrm/civicrm_handler_relationship_address.inc
@@ -73,7 +73,6 @@ class civicrm_handler_relationship_address extends civicrm_handler_relationship_
     return $join;
   }
 
-
   /**
    * Called to implement a relationship in a query.
    */
diff --git a/modules/views/civicrm/civicrm_handler_relationship_im.inc b/modules/views/civicrm/civicrm_handler_relationship_im.inc
index 4167ca1..66e52bf 100644
--- a/modules/views/civicrm/civicrm_handler_relationship_im.inc
+++ b/modules/views/civicrm/civicrm_handler_relationship_im.inc
@@ -30,7 +30,8 @@
  */
 class civicrm_handler_relationship_im extends civicrm_handler_relationship_location {
 
-  static $_provider;
+  public static $_provider;
+
   public function construct() {
     parent::construct();
     if (!self::$_provider) {
diff --git a/modules/views/civicrm/civicrm_handler_relationship_location.inc b/modules/views/civicrm/civicrm_handler_relationship_location.inc
index f83c259..8232a91 100644
--- a/modules/views/civicrm/civicrm_handler_relationship_location.inc
+++ b/modules/views/civicrm/civicrm_handler_relationship_location.inc
@@ -30,9 +30,9 @@
  */
 class civicrm_handler_relationship_location extends views_handler_relationship {
 
-  static $_locationTypes;
-  static $_locationOps;
-  static $location_op;
+  public static $_locationTypes;
+  public static $_locationOps;
+  public static $location_op;
 
   public function construct() {
     parent::construct();
@@ -126,7 +126,6 @@ class civicrm_handler_relationship_location extends views_handler_relationship {
     return $extra;
   }
 
-
   public function join_required($join = array()) {
     if (!empty($this->options['required'])) {
       $join->type = 'INNER';
diff --git a/modules/views/civicrm/civicrm_handler_relationship_participant.inc b/modules/views/civicrm/civicrm_handler_relationship_participant.inc
index a27e2f2..cfe5c40 100644
--- a/modules/views/civicrm/civicrm_handler_relationship_participant.inc
+++ b/modules/views/civicrm/civicrm_handler_relationship_participant.inc
@@ -6,7 +6,7 @@
  * to the join clause based on relationship_type_id and is_active.
  */
 class civicrm_handler_relationship_participant extends views_handler_relationship {
-  static $participant_types;
+  public static $participant_types;
 
   /**
    * Preload the list of participant roles and store in the static variable
diff --git a/modules/views/civicrm/civicrm_handler_relationship_phone.inc b/modules/views/civicrm/civicrm_handler_relationship_phone.inc
index 6a8f03a..a5e70dc 100644
--- a/modules/views/civicrm/civicrm_handler_relationship_phone.inc
+++ b/modules/views/civicrm/civicrm_handler_relationship_phone.inc
@@ -30,7 +30,8 @@
  */
 class civicrm_handler_relationship_phone extends civicrm_handler_relationship_location {
 
-  static $_phoneType;
+  public static $_phoneType;
+
   public function construct() {
     parent::construct();
     if (!self::$_phoneType) {
diff --git a/modules/views/civicrm/civicrm_handler_relationship_relationship.inc b/modules/views/civicrm/civicrm_handler_relationship_relationship.inc
index 4f52371..62931b8 100644
--- a/modules/views/civicrm/civicrm_handler_relationship_relationship.inc
+++ b/modules/views/civicrm/civicrm_handler_relationship_relationship.inc
@@ -6,7 +6,7 @@
  * to the join clause based on relationship_type_id and is_active.
  */
 class civicrm_handler_relationship_relationship extends views_handler_relationship {
-  static $relationship_types;
+  public static $relationship_types;
 
   /**
    * Preload the list of relationship_types and store in the static variable
diff --git a/modules/views/civicrm/civicrm_handler_relationship_website.inc b/modules/views/civicrm/civicrm_handler_relationship_website.inc
index 20876cd..c118b9f 100644
--- a/modules/views/civicrm/civicrm_handler_relationship_website.inc
+++ b/modules/views/civicrm/civicrm_handler_relationship_website.inc
@@ -30,7 +30,8 @@
  */
 class civicrm_handler_relationship_website extends civicrm_handler_relationship_location {
 
-  static $_websiteType;
+  public static $_websiteType;
+
   public function construct() {
     parent::construct();
     if (!self::$_websiteType) {
diff --git a/modules/views/civicrm/civicrm_handler_sort_pcp_raised_amount.inc b/modules/views/civicrm/civicrm_handler_sort_pcp_raised_amount.inc
index c6d3f80..3983bb2 100644
--- a/modules/views/civicrm/civicrm_handler_sort_pcp_raised_amount.inc
+++ b/modules/views/civicrm/civicrm_handler_sort_pcp_raised_amount.inc
@@ -28,6 +28,7 @@
  *
  */
 class civicrm_handler_sort_pcp_raised_amount extends views_handler_sort {
+
   public function query() {
     $this->ensure_my_table();
 
diff --git a/modules/views/civicrm/civicrm_plugin_argument_default.inc b/modules/views/civicrm/civicrm_plugin_argument_default.inc
index c25969c..1c08980 100644
--- a/modules/views/civicrm/civicrm_plugin_argument_default.inc
+++ b/modules/views/civicrm/civicrm_plugin_argument_default.inc
@@ -27,7 +27,8 @@
  * Default argument plugin to extract a civicrm user id via menu_get_object
  */
 class civicrm_plugin_argument_default extends views_plugin_argument_default {
-  var $option_name = 'default_argument_civicrm';
+  public $option_name = 'default_argument_civicrm';
+
   public function argument_form(&$form, &$form_state) {
     $form[$this->option_name] = array(
       '#type' => 'checkbox',
diff --git a/modules/views/components/civicrm.campaign.inc b/modules/views/components/civicrm.campaign.inc
index b8ab0e0..fb9c34f 100644
--- a/modules/views/components/civicrm.campaign.inc
+++ b/modules/views/components/civicrm.campaign.inc
@@ -29,6 +29,7 @@
  * civicrm_campaign
  */
 require_once 'CRM/Campaign/PseudoConstant.php';
+
 function _civicrm_campaign_data(&$data, $enabled) {
 
   /**
@@ -132,8 +133,8 @@ function _civicrm_campaign_data(&$data, $enabled) {
 
   civicrm_views_add_date_arguments($data['civicrm_campaign'], array(
     'title' => 'Campaign Start Date',
-      'name' => 'start_date',
-    ));
+    'name' => 'start_date',
+  ));
 
   //Mailing finish date
   $data['civicrm_campaign']['end_date'] = array(
@@ -157,8 +158,8 @@ function _civicrm_campaign_data(&$data, $enabled) {
 
   civicrm_views_add_date_arguments($data['civicrm_campaign'], array(
     'title' => 'Campaign End Date',
-      'name' => 'end_date',
-    ));
+    'name' => 'end_date',
+  ));
 
   //Campaign Type
   $data['civicrm_campaign']['campaign_type'] = array(
diff --git a/modules/views/components/civicrm.case.inc b/modules/views/components/civicrm.case.inc
index ae88555..12f2517 100644
--- a/modules/views/components/civicrm.case.inc
+++ b/modules/views/components/civicrm.case.inc
@@ -153,8 +153,8 @@ function _civicrm_case_data(&$data, $enabled) {
 
   civicrm_views_add_date_arguments($data['civicrm_case'], array(
     'title' => 'Start Date',
-      'name' => 'start_date',
-    ));
+    'name' => 'start_date',
+  ));
 
   //CASE END DATE
   $data['civicrm_case']['end_date'] = array(
@@ -175,8 +175,8 @@ function _civicrm_case_data(&$data, $enabled) {
 
   civicrm_views_add_date_arguments($data['civicrm_case'], array(
     'title' => 'End Date',
-      'name' => 'end_date',
-    ));
+    'name' => 'end_date',
+  ));
 
   //Case Details / Notes
   $data['civicrm_case']['details'] = array(
diff --git a/modules/views/components/civicrm.contribute.inc b/modules/views/components/civicrm.contribute.inc
index cda1509..2357f3d 100644
--- a/modules/views/components/civicrm.contribute.inc
+++ b/modules/views/components/civicrm.contribute.inc
@@ -206,8 +206,8 @@ function _civicrm_contribute_data(&$data, $enabled) {
 
   civicrm_views_add_date_arguments($data['civicrm_contribution'], array(
     'title' => t('Date Received'),
-      'name' => 'receive_date',
-    ));
+    'name' => 'receive_date',
+  ));
   //Non Deductible Amount of Contribution
   $data['civicrm_contribution']['non_deductible_amount'] = array(
     'title' => t('Non Deductible Amount'),
@@ -370,8 +370,8 @@ function _civicrm_contribute_data(&$data, $enabled) {
   );
   civicrm_views_add_date_arguments($data['civicrm_contribution'], array(
     'title' => 'Cancel Date',
-      'name' => 'cancel_date',
-    ));
+    'name' => 'cancel_date',
+  ));
 
   //Cancellation Reason
   $data['civicrm_contribution']['cancel_reason'] = array(
@@ -411,8 +411,8 @@ function _civicrm_contribute_data(&$data, $enabled) {
   );
   civicrm_views_add_date_arguments($data['civicrm_contribution'], array(
     'title' => 'Receipt Date',
-      'name' => 'receipt_date',
-    ));
+    'name' => 'receipt_date',
+  ));
 
   //Contribution Thank You Date
   $data['civicrm_contribution']['thankyou_date'] = array(
@@ -432,8 +432,8 @@ function _civicrm_contribute_data(&$data, $enabled) {
   );
   civicrm_views_add_date_arguments($data['civicrm_contribution'], array(
     'title' => 'Thank You Date',
-      'name' => 'thankyou_date',
-    ));
+    'name' => 'thankyou_date',
+  ));
 
   //Contribution Source
   $data['civicrm_contribution']['source'] = array(
@@ -849,8 +849,8 @@ function _civicrm_contribute_data(&$data, $enabled) {
   );
   civicrm_views_add_date_arguments($data['civicrm_contribution_recur'], array(
     'title' => 'Recurring Contribution Start Date',
-      'name' => 'start_date',
-    ));
+    'name' => 'start_date',
+  ));
   //Recurring Contribution Create Date
   $data['civicrm_contribution_recur']['create_date'] = array(
     'title' => t('Create Date'),
@@ -869,8 +869,8 @@ function _civicrm_contribute_data(&$data, $enabled) {
   );
   civicrm_views_add_date_arguments($data['civicrm_contribution_recur'], array(
     'title' => 'Recurring Contribution Create Date',
-      'name' => 'create_date',
-    ));
+    'name' => 'create_date',
+  ));
   //Recurring Contribution Modified Date
   $data['civicrm_contribution_recur']['modified_date'] = array(
     'title' => t('Modified Date'),
@@ -889,8 +889,8 @@ function _civicrm_contribute_data(&$data, $enabled) {
   );
   civicrm_views_add_date_arguments($data['civicrm_contribution_recur'], array(
     'title' => 'Recurring Contribution Modified Date',
-      'name' => 'modified_date',
-    ));
+    'name' => 'modified_date',
+  ));
   //Recurring Contribution Cancel Date
   $data['civicrm_contribution_recur']['cancel_date'] = array(
     'title' => t('Cancel Date'),
@@ -909,8 +909,8 @@ function _civicrm_contribute_data(&$data, $enabled) {
   );
   civicrm_views_add_date_arguments($data['civicrm_contribution_recur'], array(
     'title' => 'Recurring Contribution Cancel Date',
-      'name' => 'cancel_date',
-    ));
+    'name' => 'cancel_date',
+  ));
   //Recurring Contribution End Date
   $data['civicrm_contribution_recur']['end_date'] = array(
     'title' => t('End Date'),
@@ -929,8 +929,8 @@ function _civicrm_contribute_data(&$data, $enabled) {
   );
   civicrm_views_add_date_arguments($data['civicrm_contribution_recur'], array(
     'title' => 'Recurring Contribution End Date',
-      'name' => 'end_date',
-    ));
+    'name' => 'end_date',
+  ));
   //Prcocessor ID
   $data['civicrm_contribution_recur']['processor_id'] = array(
     'title' => t('Processor ID'),
@@ -1071,8 +1071,8 @@ function _civicrm_contribute_data(&$data, $enabled) {
   );
   civicrm_views_add_date_arguments($data['civicrm_contribution_recur'], array(
     'title' => 'Recurring Contribution Next Date',
-      'name' => 'next_sched_contribution',
-    ));
+    'name' => 'next_sched_contribution',
+  ));
   //How many times has the contribution failed
   $data['civicrm_contribution_recur']['failure_count'] = array(
     'title' => t('Failure Count'),
@@ -1111,8 +1111,8 @@ function _civicrm_contribute_data(&$data, $enabled) {
   );
   civicrm_views_add_date_arguments($data['civicrm_contribution_recur'], array(
     'title' => 'Recurring Contribution Failure Retry Date',
-      'name' => 'failure_retry_date',
-    ));
+    'name' => 'failure_retry_date',
+  ));
   //BOOLEAN : Does thie recurring contribution auto-renew?
   $data['civicrm_contribution_recur']['auto_renew'] = array(
     'title' => t('Auto-renew'),
diff --git a/modules/views/components/civicrm.core.inc b/modules/views/components/civicrm.core.inc
index 9d72e37..e948fb9 100644
--- a/modules/views/components/civicrm.core.inc
+++ b/modules/views/components/civicrm.core.inc
@@ -1989,7 +1989,8 @@ function _civicrm_core_data(&$data, $enabled) {
       'click sortable' => TRUE,
       'pseudo class' => 'CRM_Core_PseudoConstant',
       'pseudo method' => 'activityType',
-      'pseudo args' => array(TRUE, TRUE), // Include cases (if CiviCase is enabled)
+      // Include cases (if CiviCase is enabled)
+      'pseudo args' => array(TRUE, TRUE),
     ),
     'argument' => array(
       'handler' => 'views_handler_argument',
diff --git a/modules/views/components/civicrm.event.inc b/modules/views/components/civicrm.event.inc
index a58ac83..2c8fc69 100644
--- a/modules/views/components/civicrm.event.inc
+++ b/modules/views/components/civicrm.event.inc
@@ -242,8 +242,8 @@ function _civicrm_event_data(&$data, $enabled) {
 
   civicrm_views_add_date_arguments($data['civicrm_event'], array(
     'title' => 'Start Date',
-      'name' => 'start_date',
-    ));
+    'name' => 'start_date',
+  ));
   //EVENT END DATE
   $data['civicrm_event']['end_date'] = array(
     'title' => t('End Date'),
@@ -263,8 +263,8 @@ function _civicrm_event_data(&$data, $enabled) {
 
   civicrm_views_add_date_arguments($data['civicrm_event'], array(
     'title' => 'End Date',
-      'name' => 'end_date',
-    ));
+    'name' => 'end_date',
+  ));
   //BOOLEAN : IS ONLINE REGISTRATION ENABLED
   $data['civicrm_event']['is_online_registration'] = array(
     'title' => t('Is Online Registration On'),
@@ -300,8 +300,8 @@ function _civicrm_event_data(&$data, $enabled) {
 
   civicrm_views_add_date_arguments($data['civicrm_event'], array(
     'title' => 'Registration Start Date',
-      'name' => 'registration_start_date',
-    ));
+    'name' => 'registration_start_date',
+  ));
   //EVENT ONLINE REGISTRATION END DATE
   $data['civicrm_event']['registration_end_date'] = array(
     'title' => t('Registration End Date'),
@@ -321,8 +321,8 @@ function _civicrm_event_data(&$data, $enabled) {
 
   civicrm_views_add_date_arguments($data['civicrm_event'], array(
     'title' => 'Registration End Date',
-      'name' => 'registration_end_date',
-    ));
+    'name' => 'registration_end_date',
+  ));
 
   //EVENT LINK TEXT
   $data['civicrm_event']['registration_link_text'] = array(
@@ -576,8 +576,8 @@ function _civicrm_event_data(&$data, $enabled) {
   );
   civicrm_views_add_date_arguments($data['civicrm_participant'], array(
     'title' => 'Register Date',
-      'name' => 'register_date',
-    ));
+    'name' => 'register_date',
+  ));
 
   //BOOLEAN : IS SET TO PAY LATER
   $data['civicrm_participant']['is_pay_later'] = array(
diff --git a/modules/views/components/civicrm.mail.inc b/modules/views/components/civicrm.mail.inc
index 0ab51ef..db9de2d 100644
--- a/modules/views/components/civicrm.mail.inc
+++ b/modules/views/components/civicrm.mail.inc
@@ -540,8 +540,8 @@ function _civicrm_mail_data(&$data, $enabled) {
 
   civicrm_views_add_date_arguments($data['civicrm_mailing'], array(
     'title' => 'Created Date',
-      'name' => 'created_date',
-    ));
+    'name' => 'created_date',
+  ));
 
   //scheduled_id
 
@@ -591,8 +591,8 @@ function _civicrm_mail_data(&$data, $enabled) {
 
   civicrm_views_add_date_arguments($data['civicrm_mailing'], array(
     'title' => 'Approval Date',
-      'name' => 'approval_date',
-    ));
+    'name' => 'approval_date',
+  ));
 
   //approval_status_id
   //Based on an option value. This value is an integer
@@ -782,8 +782,8 @@ function _civicrm_mail_data(&$data, $enabled) {
 
   civicrm_views_add_date_arguments($data['civicrm_mailing_job'], array(
     'title' => 'Scheduled Date',
-      'name' => 'scheduled_date',
-    ));
+    'name' => 'scheduled_date',
+  ));
   //When did the mailing start to send
   $data['civicrm_mailing_job']['start_date'] = array(
     'title' => t('Start Date'),
@@ -803,8 +803,8 @@ function _civicrm_mail_data(&$data, $enabled) {
 
   civicrm_views_add_date_arguments($data['civicrm_mailing_job'], array(
     'title' => 'Start Date',
-      'name' => 'start_date',
-    ));
+    'name' => 'start_date',
+  ));
   //Mailing finish date
   $data['civicrm_mailing_job']['end_date'] = array(
     'title' => t('End Date'),
@@ -824,8 +824,8 @@ function _civicrm_mail_data(&$data, $enabled) {
 
   civicrm_views_add_date_arguments($data['civicrm_mailing_job'], array(
     'title' => 'End Date',
-      'name' => 'end_date',
-    ));
+    'name' => 'end_date',
+  ));
 
   //Is this a test mailing
   $data['civicrm_mailing_job']['is_test'] = array(
diff --git a/modules/views/components/civicrm.member.inc b/modules/views/components/civicrm.member.inc
index dc8f9e3..470f9c2 100644
--- a/modules/views/components/civicrm.member.inc
+++ b/modules/views/components/civicrm.member.inc
@@ -143,8 +143,8 @@ function _civicrm_member_data(&$data, $enabled) {
 
   civicrm_views_add_date_arguments($data['civicrm_membership'], array(
     'title' => 'Join Date',
-      'name' => 'join_date',
-    ));
+    'name' => 'join_date',
+  ));
 
   //Membership start date
   $data['civicrm_membership']['start_date'] = array(
@@ -165,8 +165,8 @@ function _civicrm_member_data(&$data, $enabled) {
 
   civicrm_views_add_date_arguments($data['civicrm_membership'], array(
     'title' => 'Start Date',
-      'name' => 'start_date',
-    ));
+    'name' => 'start_date',
+  ));
 
   //Membership end date
   $data['civicrm_membership']['end_date'] = array(
@@ -187,8 +187,8 @@ function _civicrm_member_data(&$data, $enabled) {
 
   civicrm_views_add_date_arguments($data['civicrm_membership'], array(
     'title' => 'End Date',
-      'name' => 'end_date',
-    ));
+    'name' => 'end_date',
+  ));
 
   //membership Source
   $data['civicrm_membership']['source'] = array(
@@ -271,8 +271,8 @@ function _civicrm_member_data(&$data, $enabled) {
 
   civicrm_views_add_date_arguments($data['civicrm_membership'], array(
     'title' => 'Reminder Date',
-      'name' => 'reminder_date',
-    ));
+    'name' => 'reminder_date',
+  ));
 
   //Numeric Membership Owner ID
   $data['civicrm_membership']['owner_membership_id'] = array(
diff --git a/modules/views/plugins/calendar_plugin_row_civicrm.inc b/modules/views/plugins/calendar_plugin_row_civicrm.inc
index fcac142..baa0d54 100644
--- a/modules/views/plugins/calendar_plugin_row_civicrm.inc
+++ b/modules/views/plugins/calendar_plugin_row_civicrm.inc
@@ -19,9 +19,13 @@
  * and formats it as a Calendar node.
  */
 class calendar_plugin_row_civicrm extends calendar_plugin_row {
-  // Basic properties that let the row style follow relationships.
-  var $base_table = '';
-  var $base_field = 'id';
+  /**
+   * Basic properties that let the row style follow relationships.
+   * @var string
+   */
+  public $base_table = '';
+  public $base_field = 'id';
+
   public function construct() {
     parent::construct();
     if (!civicrm_initialize()) {
@@ -29,6 +33,7 @@ class calendar_plugin_row_civicrm extends calendar_plugin_row {
     }
     $this->base_table = $this->definition['base'][0];
   }
+
   public function option_definition() {
     $options = parent::option_definition();
     $options['date_fields'] = array('default' => array());
@@ -81,7 +86,7 @@ class calendar_plugin_row_civicrm extends calendar_plugin_row {
     // Sadly neither DAO nor API allows you to load multiple at once eg node_load_multiple()
     foreach ($ids as $key => $id) {
       require_once str_replace('_', DIRECTORY_SEPARATOR, $this->definition['dao class']) . '.php';
-      $dao = New $this->definition['dao class']();
+      $dao = new $this->definition['dao class']();
       $dao->id = $id;
       $dao->find();
       $dao->fetch();
diff --git a/modules/views/plugins/calendar_plugin_row_civicrm_event.inc b/modules/views/plugins/calendar_plugin_row_civicrm_event.inc
index 8b51cff..07036cc 100644
--- a/modules/views/plugins/calendar_plugin_row_civicrm_event.inc
+++ b/modules/views/plugins/calendar_plugin_row_civicrm_event.inc
@@ -10,12 +10,19 @@
  * and formats it as a Calendar node.
  */
 class calendar_plugin_row_civicrm_event extends calendar_plugin_row_node {
-  // Basic properties that let the row style follow relationships.
-  var $base_table = 'civicrm_event';
-  var $base_field = 'id';
+  /**
+   * Basic properties that let the row style follow relationships.
+   * @var string
+   */
+  public $base_table = 'civicrm_event';
+  public $base_field = 'id';
+
+  /**
+   * Stores the nodes loaded with pre_render.
+   * @var array
+   */
+  public $nodes = array();
 
-  // Stores the nodes loaded with pre_render.
-  var $nodes = array();
   public function construct() {
     parent::construct();
     if (!civicrm_initialize()) {
@@ -101,7 +108,7 @@ class calendar_plugin_row_civicrm_event extends calendar_plugin_row_node {
     // and object, hence using DAO
     foreach ($ids as $key => $id) {
       require_once 'CRM/Event/DAO/Event.php';
-      $dao = New CRM_Event_DAO_Event();
+      $dao = new CRM_Event_DAO_Event();
       $dao->id = $id;
       $dao->find();
       $dao->fetch();

From 9b3d58eca7ab4bbd2afaa07849128971632376f7 Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Fri, 12 Apr 2019 08:10:15 +1000
Subject: [PATCH 72/86] (NFC) Get phpcs to ignore the use of eval in this file
 as it is required

---
 tests/phpunit/bootstrap.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/phpunit/bootstrap.php b/tests/phpunit/bootstrap.php
index 9f4a9e3..0fd92ba 100644
--- a/tests/phpunit/bootstrap.php
+++ b/tests/phpunit/bootstrap.php
@@ -5,8 +5,9 @@
 
 ini_set('memory_limit', '2G');
 ini_set('safe_mode', 0);
+// phpcs:disable
 eval(cv('php:boot', 'phpcode'));
-
+// phpcs:enable
 assert("CIVICRM_UF === 'Drupal'");
 
 /**

From fa3eb4a958163cfca13d0836bf917e3d023681c6 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Thu, 11 Apr 2019 18:34:28 -0700
Subject: [PATCH 73/86] (NFC) Update for compliance with next phpcs standard

---
 civicrm.module                                 | 18 ++++++++----------
 .../civicrm_contact_ref.module                 |  3 ++-
 modules/civicrm_engage/civicrm_engage.module   |  1 +
 .../civicrm_group_roles.module                 | 16 ++++++++--------
 .../civicrm_member_roles.module                | 16 ++++++++--------
 modules/civicrm_og_sync/civicrm_og_sync.module |  1 -
 modules/civicrm_rules/civicrm_rules.module     |  1 +
 modules/civicrmtheme/civicrmtheme.module       |  6 ++++--
 8 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/civicrm.module b/civicrm.module
index 034dbd3..5308e9f 100644
--- a/civicrm.module
+++ b/civicrm.module
@@ -201,11 +201,10 @@ function civicrm_initialize() {
     if (!include_once 'CRM/Core/Config.php') {
       $failure = TRUE;
       drupal_set_message(t("<strong><p class='error'>Oops! - The path for including CiviCRM code files is not set properly. Most likely there is an error in the <em>civicrm_root</em> setting in your CiviCRM settings file (!1). </p><p class='error'> &raquo; civicrm_root is currently set to: <em>!2</em></p><p class='error'>!3</p></strong>", array(
-          '!1' => $settingsFile,
-          '!2' => $civicrm_root,
-          '!3' => $errorMsgAdd,
-        ))
-      );
+        '!1' => $settingsFile,
+        '!2' => $civicrm_root,
+        '!3' => $errorMsgAdd,
+      )));
       return FALSE;
     }
 
@@ -330,7 +329,7 @@ function _civicrm_registerClassLoader() {
  *
  * @param string $default contact type
  *
- * @return string $ctype
+ * @return string
  *   Contact type
  */
 function civicrm_get_ctype($default = NULL) {
@@ -445,7 +444,7 @@ function civicrm_invoke() {
   $pageContent = CRM_Core_Invoke::invoke($args);
 
   $printedContent = ob_get_clean();
-  if (empty($pageContent) AND
+  if (empty($pageContent) and
     !empty($printedContent)
   ) {
     $pageContent = $printedContent;
@@ -664,7 +663,7 @@ function _civicrm_get_user_profile_id($name) {
         ));
         continue;
       }
-      catch (Exception $e){
+      catch (Exception $e) {
       }
     }
   }
@@ -945,8 +944,7 @@ function civicrm_theme_registry_alter(&$theme_registry) {
  */
 function civicrm_preprocess_page(&$variables) {
   // to increase it's flexibility.
-  if (module_exists('date_popup') && (in_array(arg(0), array(
-    'civicrm', 'user')))) {
+  if (module_exists('date_popup') && (in_array(arg(0), array('civicrm', 'user')))) {
 
     /**
      * Have hidden this function as it is not needed,
diff --git a/modules/civicrm_contact_ref/civicrm_contact_ref.module b/modules/civicrm_contact_ref/civicrm_contact_ref.module
index 23037a4..9b83eff 100644
--- a/modules/civicrm_contact_ref/civicrm_contact_ref.module
+++ b/modules/civicrm_contact_ref/civicrm_contact_ref.module
@@ -27,7 +27,8 @@ function civicrm_contact_ref_field_info() {
       'description' => t('Reference a CiviCRM contact.'),
       'default_widget' => 'options_select',
       'default_formatter' => 'civicrm_contact_ref_link',
-      'property_type' => 'integer', // note that this property is used by entity.module
+      // note that this property is used by entity.module
+      'property_type' => 'integer',
     ),
   );
 }
diff --git a/modules/civicrm_engage/civicrm_engage.module b/modules/civicrm_engage/civicrm_engage.module
index 3a094e0..9825e82 100644
--- a/modules/civicrm_engage/civicrm_engage.module
+++ b/modules/civicrm_engage/civicrm_engage.module
@@ -36,6 +36,7 @@
 define('CIVICRM_ENGAGE_CG_DEMOGRAPHICS_NAME', 'Demographics');
 define('CIVICRM_ENGAGE_DEMOGRAPHICS_PREFIX', 'demographics_');
 define('CIVICRM_ENGAGE_DEMOGRAPHICS_TITLE', 'Demographics');
+
 function _civicrm_engage_getCustomGroupID($customGroupName) {
   require_once 'CRM/Utils/Type.php';
   $customGroupName = CRM_Utils_Type::escape($customGroupName, 'String');
diff --git a/modules/civicrm_group_roles/civicrm_group_roles.module b/modules/civicrm_group_roles/civicrm_group_roles.module
index bcdf32b..22ee1d6 100644
--- a/modules/civicrm_group_roles/civicrm_group_roles.module
+++ b/modules/civicrm_group_roles/civicrm_group_roles.module
@@ -551,9 +551,9 @@ function civicrm_group_roles_add_rule_form_submit($form, &$form_state) {
   if (isset($form_state['values']['edit_flag'])) {
 
     $edit_rule = db_update('civicrm_group_roles_rules')->fields(array(
-                   'role_id' => (int) $form_state['values']['add_rule']['select_role'],
-                   'group_id' => (int) $form_state['values']['add_rule']['select_group'],
-                 ))->condition('id', (int) $form_state['values']['edit_flag'])->execute();
+      'role_id' => (int) $form_state['values']['add_rule']['select_role'],
+      'group_id' => (int) $form_state['values']['add_rule']['select_group'],
+    ))->condition('id', (int) $form_state['values']['edit_flag'])->execute();
 
     if ($edit_rule) {
       drupal_set_message(t('Your association rule has been edited.'));
@@ -561,9 +561,9 @@ function civicrm_group_roles_add_rule_form_submit($form, &$form_state) {
   }
   else {
     $add_rule = db_insert('civicrm_group_roles_rules')->fields(array(
-                  'role_id' => (int) $form_state['values']['add_rule']['select_role'],
-                  'group_id' => (int) $form_state['values']['add_rule']['select_group'],
-                ))->execute();
+      'role_id' => (int) $form_state['values']['add_rule']['select_role'],
+      'group_id' => (int) $form_state['values']['add_rule']['select_group'],
+    ))->execute();
 
     if ($add_rule) {
       drupal_set_message(t('Your association rule has been added.'));
@@ -648,7 +648,8 @@ function civicrm_group_roles_add_remove_groups($roles, $user, $op) {
         } //end foreach
       } //end foreach
 
-    } //end if contact_id
+    }
+    //end if contact_id
 
     else {
       watchdog('civicrm_group_roles', $msg, $variables, WATCHDOG_ERROR);
@@ -660,7 +661,6 @@ function civicrm_group_roles_add_remove_groups($roles, $user, $op) {
   } //endif $roles
 }
 
-
 /**
  * Manual sync form. Provides a submit button to manually sync groups to roles.
  *
diff --git a/modules/civicrm_member_roles/civicrm_member_roles.module b/modules/civicrm_member_roles/civicrm_member_roles.module
index 2e05d7c..ce450b6 100644
--- a/modules/civicrm_member_roles/civicrm_member_roles.module
+++ b/modules/civicrm_member_roles/civicrm_member_roles.module
@@ -438,10 +438,10 @@ function civicrm_member_roles_add_rule_form_submit($form, &$form_state) {
   //If edit_flag is set then process as an edit form, if not then process as an add form.
   if (isset($form_state['values']['edit_flag'])) {
     $edit_rule = db_update('civicrm_member_roles_rules')->fields(array(
-        'rid' => (int) $form_state['values']['add_rule']['select_role'],
-        'type_id' => (int) $form_state['values']['add_rule']['select_membership'],
-        'status_codes' => serialize($codes),
-      ))->condition('rule_id', (int) $form_state['values']['edit_flag'])->execute();
+      'rid' => (int) $form_state['values']['add_rule']['select_role'],
+      'type_id' => (int) $form_state['values']['add_rule']['select_membership'],
+      'status_codes' => serialize($codes),
+    ))->condition('rule_id', (int) $form_state['values']['edit_flag'])->execute();
 
     if ($edit_rule) {
       drupal_set_message(t('Your association rule has been edited.'));
@@ -449,10 +449,10 @@ function civicrm_member_roles_add_rule_form_submit($form, &$form_state) {
   }
   else {
     $add_rule = db_insert('civicrm_member_roles_rules')->fields(array(
-        'rid' => (int) $form_state['values']['add_rule']['select_role'],
-        'type_id' => (int) $form_state['values']['add_rule']['select_membership'],
-        'status_codes' => serialize($codes),
-      ))->execute();
+      'rid' => (int) $form_state['values']['add_rule']['select_role'],
+      'type_id' => (int) $form_state['values']['add_rule']['select_membership'],
+      'status_codes' => serialize($codes),
+    ))->execute();
     if ($add_rule) {
       drupal_set_message(t('Your association rule has been added.'));
     }
diff --git a/modules/civicrm_og_sync/civicrm_og_sync.module b/modules/civicrm_og_sync/civicrm_og_sync.module
index 7aaca50..0ee8cc5 100644
--- a/modules/civicrm_og_sync/civicrm_og_sync.module
+++ b/modules/civicrm_og_sync/civicrm_og_sync.module
@@ -53,7 +53,6 @@
  * mirroring OG for most organizations.
  */
 
-
 /**
  * Implements hook_node_update().
  */
diff --git a/modules/civicrm_rules/civicrm_rules.module b/modules/civicrm_rules/civicrm_rules.module
index 852f174..d65ca82 100644
--- a/modules/civicrm_rules/civicrm_rules.module
+++ b/modules/civicrm_rules/civicrm_rules.module
@@ -185,6 +185,7 @@ FROM   civicrm_mailing
     }
   }
 }
+
 /**
  * Implements hook_permission().
  */
diff --git a/modules/civicrmtheme/civicrmtheme.module b/modules/civicrmtheme/civicrmtheme.module
index 3a180dc..ba34d85 100644
--- a/modules/civicrmtheme/civicrmtheme.module
+++ b/modules/civicrmtheme/civicrmtheme.module
@@ -69,7 +69,8 @@ function civicrmtheme_form_system_themes_admin_form_alter(&$form, $form_state) {
   $form['admin_theme']['civicrm']['civicrm_admin'] = array(
     '#type' => 'select',
     '#options' => array(
-      0 => t('Default theme')) + $theme_list,
+      0 => t('Default theme'),
+    ) + $theme_list,
     '#title' => t('CiviCRM Administration theme'),
     '#description' => t('Choose theme for CiviCRM administration/backend pages.'),
     '#default_value' => variable_get('civicrmtheme_theme_admin', 0),
@@ -78,7 +79,8 @@ function civicrmtheme_form_system_themes_admin_form_alter(&$form, $form_state) {
   $form['admin_theme']['civicrm']['civicrm_public'] = array(
     '#type' => 'select',
     '#options' => array(
-      0 => t('Default theme')) + $theme_list,
+      0 => t('Default theme'),
+    ) + $theme_list,
     '#title' => t('CiviCRM Public theme'),
     '#description' => t('Choose theme for CiviCRM frontend pages.'),
     '#default_value' => variable_get('civicrmtheme_theme_public', 0),

From 5459700aec920f37e241c55cd7abb2c677b5969b Mon Sep 17 00:00:00 2001
From: Herb vd Dool <herb@3speedhub.com>
Date: Mon, 22 Apr 2019 00:04:18 -0400
Subject: [PATCH 74/86] Issue 48: make it next_sched_contribution_date

---
 modules/views/components/civicrm.contribute.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/views/components/civicrm.contribute.inc b/modules/views/components/civicrm.contribute.inc
index 2357f3d..9fba647 100644
--- a/modules/views/components/civicrm.contribute.inc
+++ b/modules/views/components/civicrm.contribute.inc
@@ -1054,7 +1054,7 @@ function _civicrm_contribute_data(&$data, $enabled) {
     ),
   );
   //Recurring Contribution End Date
-  $data['civicrm_contribution_recur']['next_sched_contribution'] = array(
+  $data['civicrm_contribution_recur']['next_sched_contribution_date'] = array(
     'title' => t('Next Contribution Date'),
     'help' => t('The Next Contribution Date.'),
     'field' => array(
@@ -1071,7 +1071,7 @@ function _civicrm_contribute_data(&$data, $enabled) {
   );
   civicrm_views_add_date_arguments($data['civicrm_contribution_recur'], array(
     'title' => 'Recurring Contribution Next Date',
-    'name' => 'next_sched_contribution',
+    'name' => 'next_sched_contribution_date',
   ));
   //How many times has the contribution failed
   $data['civicrm_contribution_recur']['failure_count'] = array(

From b5e3b8b7188039f0806e5d0b17b5c16cdf134237 Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Sat, 2 Dec 2017 17:37:17 +1100
Subject: [PATCH 75/86] CRM-20006 Standard groups relationships in views

---
 civicrm.info                                  |   4 +
 modules/views/civicrm.views.inc               |  13 ++
 .../civicrm_handler_filter_group_name.inc     |  69 +++++++
 .../civicrm_handler_relationship_group.inc    | 186 ++++++++++++++++++
 ...rm_handler_relationship_standard_group.inc |  15 ++
 ...er_relationship_standard_group_contact.inc | 136 +++++++++++++
 modules/views/components/civicrm.core.inc     | 110 ++++++++---
 7 files changed, 510 insertions(+), 23 deletions(-)
 create mode 100644 modules/views/civicrm/civicrm_handler_filter_group_name.inc
 create mode 100644 modules/views/civicrm/civicrm_handler_relationship_group.inc
 create mode 100644 modules/views/civicrm/civicrm_handler_relationship_standard_group.inc
 create mode 100644 modules/views/civicrm/civicrm_handler_relationship_standard_group_contact.inc

diff --git a/civicrm.info b/civicrm.info
index a146ec8..f3089c3 100644
--- a/civicrm.info
+++ b/civicrm.info
@@ -60,6 +60,7 @@ files[] = modules/views/civicrm/civicrm_handler_filter_custom_option.inc
 files[] = modules/views/civicrm/civicrm_handler_filter_datetime.inc
 files[] = modules/views/civicrm/civicrm_handler_filter_encounter_medium.inc
 files[] = modules/views/civicrm/civicrm_handler_filter_group_status.inc
+files[] = modules/views/civicrm/civicrm_handler_filter_group_name.inc
 files[] = modules/views/civicrm/civicrm_handler_filter_custom_option.inc
 files[] = modules/views/civicrm/civicrm_handler_filter_custom_single_option.inc
 files[] = modules/views/civicrm/civicrm_handler_filter_relationship_type.inc
@@ -97,6 +98,9 @@ files[] = modules/views/civicrm/civicrm_handler_relationship_im.inc
 files[] = modules/views/civicrm/civicrm_handler_relationship_website.inc
 files[] = modules/views/civicrm/civicrm_handler_relationship_address.inc
 files[] = modules/views/civicrm/civicrm_handler_relationship_participant.inc
+files[] = modules/views/civicrm/civicrm_handler_relationship_group.inc
+files[] = modules/views/civicrm/civicrm_handler_relationship_standard_group.inc
+files[] = modules/views/civicrm/civicrm_handler_relationship_standard_group_contact.inc
 
 ; views plugins
 files[] = modules/views/plugins/calendar_plugin_row_civicrm.inc
diff --git a/modules/views/civicrm.views.inc b/modules/views/civicrm.views.inc
index cb63029..2d54baa 100644
--- a/modules/views/civicrm.views.inc
+++ b/modules/views/civicrm.views.inc
@@ -368,6 +368,19 @@ function civicrm_views_custom_data_cache(&$data, $entity_type, $group_id, $sub_t
           'field' => 'entity_id',
         );
       }
+
+      // Expose group custom data to group relationship.
+      if ($join_table == 'civicrm_group') {
+        $data[$current_group['table_name']]['table']['join']['civicrm_group'] = array(
+          'left_field' => 'id',
+          'field'      => 'entity_id',
+        );
+        $data[$current_group['table_name']]['table']['join']['civicrm_group_contact'] = array(
+          'left_table' => $join_table,
+          'left_field' => 'id',
+          'field'      => 'entity_id',
+        );
+      }
     }
 
     foreach ($current_group['fields'] as $key => $current_field) {
diff --git a/modules/views/civicrm/civicrm_handler_filter_group_name.inc b/modules/views/civicrm/civicrm_handler_filter_group_name.inc
new file mode 100644
index 0000000..8ff8dce
--- /dev/null
+++ b/modules/views/civicrm/civicrm_handler_filter_group_name.inc
@@ -0,0 +1,69 @@
+<?php
+/*
+  +--------------------------------------------------------------------+
+  | CiviCRM version 4.7                                                |
+  +--------------------------------------------------------------------+
+  | 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        |
+  +--------------------------------------------------------------------+
+ */
+
+
+/**
+ * CiviCRM Views Integration
+ */
+class civicrm_handler_filter_group_name extends views_handler_filter_in_operator {
+  private $civi_groups;
+  protected $is_standard = TRUE;
+
+  public function construct() {
+    parent::construct();
+
+    if (empty($this->civi_groups)) {
+      if (!civicrm_initialize()) {
+        return;
+      }
+      $standard_or_smart = ($this->is_standard ? 'IS NULL' : 'IS NOT NULL');
+      $result = civicrm_api3('Group', 'get', array(
+          'return' => array("name", "title"),
+          'is_hidden' => 0,
+          'is_active' => 1,
+          'saved_search_id' => array($standard_or_smart => 1),
+          'options' => array('limit' => 0, 'sort' => "title"),
+      ));
+      $this->civi_groups = array();
+      foreach ($result['values'] as $group) {
+        if (isset($group['name'])) {
+          $this->civi_groups[$group['name']] = $group['title'];
+        }
+      }
+    }
+  }
+
+  public function get_value_options() {
+    if (!isset($this->value_options)) {
+      $this->value_title = t('Contact Group Title');
+      $options = array();
+      foreach ($this->civi_groups as $name => $title) {
+        $options[$name] = $title;
+      }
+      $this->value_options = $options;
+    }
+  }
+
+}
diff --git a/modules/views/civicrm/civicrm_handler_relationship_group.inc b/modules/views/civicrm/civicrm_handler_relationship_group.inc
new file mode 100644
index 0000000..208c097
--- /dev/null
+++ b/modules/views/civicrm/civicrm_handler_relationship_group.inc
@@ -0,0 +1,186 @@
+<?php
+
+/**
+ * This relationship handler is used when joining the civicrm_group_contact table
+ * to the civicrm_contact table. This handler allows us to optionally add conditions
+ * to the join clause based on group_id, status, group title, is_active, group is standard group.
+ */
+class civicrm_handler_relationship_group extends views_handler_relationship {
+  static $civi_group_types;
+  private $civi_groups;
+  protected $is_standard;
+
+  /**
+   * Preload the list of group_types & titles and store in the static variables
+   */
+  public function construct() {
+    parent::construct();
+
+    if (!civicrm_initialize()) {
+      return;
+    }
+
+    self::$civi_group_types = CRM_Contact_BAO_Group::buildOptions('group_type');
+
+    $standard_or_smart = ($this->is_standard ? 'IS NULL' : 'IS NOT NULL');
+    $result = civicrm_api3('Group', 'get', array(
+        'return' => array("name", "title", "group_type"),
+        'is_hidden' => 0,
+        'is_active' => 1,
+        'saved_search_id' => array($standard_or_smart => 1),
+        'options' => array('limit' => 0, 'sort' => "title"),
+    ));
+    $this->civi_groups = array();
+    foreach ($result['values'] as $group) {
+      $group_types = array();
+      if (!empty($group['group_type'])) {
+        foreach ((array) $group['group_type'] as $type) {
+          if (!empty($type)) {
+            $group_types[] = (isset(self::$civi_group_types[$type]) ? self::$civi_group_types[$type] : $type);
+          }
+        }
+      }
+
+      if (isset($group['name'])) {
+        $group_type = '';
+        if (!empty($group_types)) {
+          $group_type = implode(', ', $group_types);
+        }
+        $this->civi_groups[$group['name']] = $group['title'] . ' | ' . $group_type;
+      }
+    }
+  }
+
+
+  /**
+   * Add additional options
+   * to the view. By defining these here, Views will take care of saving the
+   * values submitted from the options form.
+   */
+  public function option_definition() {
+    $options = parent::option_definition();
+    $options['civi_group_type'] = array('default' => NULL);
+    $options['civi_group_name'] = array('default' => NULL);
+    return $options;
+  }
+
+  /**
+   * Relationship configuration form.
+   */
+  public function options_form(&$form, &$form_state) {
+    parent::options_form($form, $form_state);
+
+    $form['civi_group_type'] = array(
+      '#type' => 'select',
+      '#multiple' => TRUE,
+      '#title' => 'Choose a specific group type',
+      '#options' => self::$civi_group_types,
+      '#description' => t('Choose to limit this relationship to one or more specific types of CiviCRM group.'),
+      '#default_value' => $this->options['civi_group_type'],
+    );
+    $form['civi_group_name'] = array(
+      '#type' => 'select',
+      '#multiple' => TRUE,
+      '#title' => 'Choose a specific group',
+      '#options' => $this->civi_groups,
+      '#description' => t('Choose to limit this relationship to one or more specific CiviCRM groups.'),
+      '#default_value' => $this->options['civi_group_name'],
+    );
+  }
+
+
+  public function join_required($join = array()) {
+    if (!empty($this->options['required'])) {
+      $join->type = 'INNER';
+    }
+    return $join;
+  }
+
+
+  public function join_group_type($join = array()) {
+    $extra = array();
+    if (isset($join->extra)) {
+      $extra = $join->extra;
+    }
+    if (isset($this->options['civi_group_type']) && $this->options['civi_group_type']) {
+      $sep = CRM_Core_DAO::VALUE_SEPARATOR;
+
+      $extra[] = array(
+        'value' => "($sep" . implode("$sep|$sep", $this->options['civi_group_type']) . "$sep)",
+        'numeric' => FALSE,
+        'field' => 'group_type',
+        'operator' => 'RLIKE',
+      );
+    }
+    if (!empty($extra)) {
+      $join->extra = $extra;
+    }
+    return $join;
+  }
+
+  public function join_group_name($join = array()) {
+    $extra = array();
+    if (isset($join->extra)) {
+      $extra = $join->extra;
+    }
+    if (isset($this->options['civi_group_name']) && $this->options['civi_group_name']) {
+      $extra[] = array(
+        'value' => $this->options['civi_group_name'],
+        'numeric' => FALSE,
+        'field' => 'name',
+      );
+    }
+    if (!empty($extra)) {
+      $join->extra = $extra;
+    }
+    return $join;
+  }
+
+
+  public function join_group_active_not_hidden($join = array()) {
+    $extra = array();
+    if (isset($join->extra)) {
+      $extra = $join->extra;
+    }
+    $extra[] = array(
+      'value' => 1,
+      'numeric' => TRUE,
+      'field' => 'is_active',
+    );
+    $extra[] = array(
+      'value' => 0,
+      'numeric' => TRUE,
+      'field' => 'is_hidden',
+    );
+
+    $join->extra = $extra;
+    return $join;
+  }
+
+  public function get_join() {
+    $join = parent::get_join();
+    $join = $this->join_group_active_not_hidden($join);
+    $join = $this->join_required($join);
+    $join = $this->join_group_type($join);
+    $join = $this->join_group_name($join);
+    return $join;
+  }
+
+
+  /**
+   * Called to implement a relationship in a query.
+   */
+  public function query() {
+    $join = $this->get_join();
+    $this->alias = $this->query->add_table($this->table, $this->relationship, $join);
+    //register relationship
+    $this->view->relationship[$this->options['id']]->alias = $this->alias;
+    $this->query->relationships[$this->alias] = array(
+      'link' => $this->relationship,
+      'table' => $this->table,
+      'base' => $this->table,
+    );
+
+  }
+
+}
diff --git a/modules/views/civicrm/civicrm_handler_relationship_standard_group.inc b/modules/views/civicrm/civicrm_handler_relationship_standard_group.inc
new file mode 100644
index 0000000..801b286
--- /dev/null
+++ b/modules/views/civicrm/civicrm_handler_relationship_standard_group.inc
@@ -0,0 +1,15 @@
+<?php
+
+/**
+ * This relationship handler is used when joining the civicrm_group_contact table
+ * to the civicrm_contact table. This handler allows us to optionally add conditions
+ * to the join clause based on group_id, status, group title, is_active, group is standard group.
+ */
+class civicrm_handler_relationship_standard_group extends civicrm_handler_relationship_group {
+
+  public function construct() {
+    $this->is_standard = TRUE;
+    parent::construct();
+  }
+
+}
diff --git a/modules/views/civicrm/civicrm_handler_relationship_standard_group_contact.inc b/modules/views/civicrm/civicrm_handler_relationship_standard_group_contact.inc
new file mode 100644
index 0000000..bf4305b
--- /dev/null
+++ b/modules/views/civicrm/civicrm_handler_relationship_standard_group_contact.inc
@@ -0,0 +1,136 @@
+<?php
+
+/**
+ * This relationship handler is used when joining the civicrm_group_contact table
+ * to the civicrm_contact table. This handler allows us to optionally add conditions
+ * to the join clause based on group_id, status, group title, is_active, group is standard group.
+ */
+class civicrm_handler_relationship_standard_group_contact extends views_handler_relationship {
+  static $group_status;
+  private $group_ids = array();
+  private $group_titles = array();
+
+  /**
+   * Preload the list of group_types & titles and store in the static variables
+   */
+  public function construct() {
+    parent::construct();
+
+    if (!civicrm_initialize()) {
+      return;
+    }
+
+    if (empty(self::$group_status)) {
+      self::$group_status = CRM_Contact_BAO_GroupContact::buildOptions('status');
+    }
+
+    $result = civicrm_api3('Group', 'get', array(
+        'return' => array("name", "title"),
+        'is_hidden' => 0,
+        'is_active' => 1,
+        'saved_search_id' => array('IS NULL' => 1),
+        'options' => array('limit' => 0, 'sort' => "title"),
+    ));
+    foreach ($result['values'] as $group) {
+      if (isset($group['name'])) {
+        $this->group_ids[$group['name']] = $group['id'];
+        $this->group_titles[$group['name']] = $group['title'];
+      }
+    }
+  }
+
+  /**
+   * Add additional options
+   * to the view. By defining these here, Views will take care of saving the
+   * values submitted from the options form.
+   */
+  public function option_definition() {
+    $options = parent::option_definition();
+    $options['group_status'] = array('default' => 'Added');
+    $options['group_names'] = array('default' => NULL);
+    return $options;
+  }
+
+  /**
+   * Relationship configuration form.
+   */
+  public function options_form(&$form, &$form_state) {
+    parent::options_form($form, $form_state);
+
+    $form['group_status'] = array(
+      '#type' => 'select',
+      '#multiple' => TRUE,
+      '#title' => 'Choose a specific group status',
+      '#options' => self::$group_status,
+      '#description' => t('Choose to limit this relationship to one or more specific status of CiviCRM group.'),
+      '#default_value' => $this->options['group_status'],
+    );
+    $form['group_names'] = array(
+      '#type' => 'select',
+      '#multiple' => TRUE,
+      '#title' => 'Choose a specific group',
+      '#options' => $this->group_titles,
+      '#description' => t('Choose to limit this relationship to one or more specific CiviCRM groups.'),
+      '#default_value' => $this->options['group_names'],
+    );
+  }
+
+  public function join_required($join = array()) {
+    if (!empty($this->options['required'])) {
+      $join->type = 'INNER';
+    }
+    return $join;
+  }
+
+  public function join_group_contact($join = array()) {
+    $extra = array();
+    if (isset($join->extra)) {
+      $extra = $join->extra;
+    }
+    if (!empty($this->options['group_status'])) {
+      $extra[] = array(
+        'value' => $this->options['group_status'],
+        'numeric' => FALSE,
+        'field' => 'status',
+      );
+    }
+    if (!empty($this->options['group_names'])) {
+      $values = array();
+      foreach (array_keys($this->options['group_names']) as $name) {
+        $values[] = $this->group_ids[$name];
+      }
+      $extra[] = array(
+        'value' => $values,
+        'numeric' => TRUE,
+        'field' => 'group_id',
+      );
+    }
+    if (!empty($extra)) {
+      $join->extra = $extra;
+    }
+    return $join;
+  }
+
+  public function get_join() {
+    $join = parent::get_join();
+    $join = $this->join_required($join);
+    $join = $this->join_group_contact($join);
+    return $join;
+  }
+
+  /**
+   * Called to implement a relationship in a query.
+   */
+  public function query() {
+    $join = $this->get_join();
+    $this->alias = $this->query->add_table($this->table, $this->relationship, $join);
+    //register relationship
+    $this->view->relationship[$this->options['id']]->alias = $this->alias;
+    $this->query->relationships[$this->alias] = array(
+      'link' => $this->relationship,
+      'table' => $this->table,
+      'base' => $this->table,
+    );
+  }
+
+}
diff --git a/modules/views/components/civicrm.core.inc b/modules/views/components/civicrm.core.inc
index e948fb9..d60d22f 100644
--- a/modules/views/components/civicrm.core.inc
+++ b/modules/views/components/civicrm.core.inc
@@ -2797,6 +2797,22 @@ function _civicrm_core_data(&$data, $enabled) {
   }
 
   // Add support for CivicRM groups table
+  $data['civicrm_group_contact']['table']['group'] = t('CiviCRM Groups');
+
+  $data['civicrm_group_contact']['table']['join']['civicrm_contact'] = array(
+    'left_field' => 'id',
+    'field' => 'contact_id',
+  );
+
+  $data['civicrm_contact']['table']['join']['civicrm_group_contact'] = array(
+    'left_field' => 'contact_id',
+    'field' => 'id',
+  );
+
+  $data['civicrm_group_contact']['table']['join']['civicrm_group_contact'] = array(
+    'left_field' => 'id',
+    'field' => 'id',
+  );
 
   $data['civicrm_group']['table']['group'] = t('CiviCRM Groups');
 
@@ -2806,43 +2822,52 @@ function _civicrm_core_data(&$data, $enabled) {
     'help' => t("View displays CiviCRM Groups."),
   );
 
-  $data['civicrm_group']['table']['join']['civicrm_contact'] = array(
-    'left_table' => 'civicrm_group_contact',
+  $data['civicrm_group']['table']['join']['civicrm_contact_contact'] = array(
     'left_field' => 'group_id',
     'field' => 'id',
   );
 
-  $data['civicrm_group_contact']['table']['join']['civicrm_contact'] = array(
+  $data['civicrm_group_contact']['table']['join']['civicrm_group'] = array(
     // Directly links to group table
     'left_field' => 'id',
-    'field' => 'contact_id',
+    'field' => 'group_id',
   );
 
-  $data['civicrm_group_contact']['table']['group'] = t('CiviCRM Groups');
-  $data['civicrm_group_status']['table']['group'] = t('Contact Group Status');
+  $data['civicrm_group']['table']['join']['civicrm_group'] = array(
+    'left_field' => 'id',
+    'field' => 'id',
+  );
 
-  $data['civicrm_group_contact']['status'] = array(
-    'title' => t('Contact Status'),
-    'help' => t('The group status of the contact'),
-    'field' => array(
-      'handler' => 'civicrm_handler_filter_group_status',
-      'click sortable' => TRUE,
-    ),
-    'filter' => array(
-      'handler' => 'civicrm_handler_filter_group_status',
-      'allow empty' => TRUE,
-    ),
+  $data['civicrm_group']['table']['join']['civicrm_contact'] = array(
+    'left_table' => 'civicrm_group_contact',
+    'left_field' => 'group_id',
+    'field' => 'id',
   );
 
   // CiviCRM Groups - FIELDS
-
-  // Numeric Group ID
+  //Group Contact ID
+  $data['civicrm_group_contact']['id'] = array(
+    'title' => t('Contact in Standard Group'),
+    'help' => t('The contact is part of a standard group'),
+    'relationship' => array(
+      'base' => 'civicrm_contact',
+      'base field' => 'id',
+      'relationship table' => 'civicrm_group_contact',
+      'relationship field' => 'contact_id',
+      'handler' => 'civicrm_handler_relationship_standard_group_contact',
+      'label' => t('CiviCRM Standard Group Contact'),
+    ),
+  );
+  // Group Status
   $data['civicrm_group_contact']['status'] = array(
     'title' => t('Contact Status'),
     'help' => t('The group status of the contact'),
     'field' => array(
-      'handler' => 'civicrm_handler_filter_group_status',
+      'handler' => 'civicrm_handler_field_pseudo_constant',
       'click sortable' => TRUE,
+      'pseudo class' => 'CRM_Contact_BAO_GroupContact',
+      'pseudo method' => 'buildOptions',
+      'pseudo args' => array('status'),
     ),
     'filter' => array(
       'handler' => 'civicrm_handler_filter_group_status',
@@ -2850,8 +2875,6 @@ function _civicrm_core_data(&$data, $enabled) {
     ),
   );
 
-  //CiviCRM Groups - FIELDS
-
   //Numeric Group ID
   $data['civicrm_group']['id'] = array(
     'title' => t('Group ID'),
@@ -2871,7 +2894,16 @@ function _civicrm_core_data(&$data, $enabled) {
     'sort' => array(
       'handler' => 'views_handler_sort',
     ),
+    'relationship' => array(
+      'base' => 'civicrm_group_contact',
+      'base field' => 'group_id',
+      'relationship table' => 'civicrm_group',
+      'relationship field' => 'id',
+      'handler' => 'civicrm_handler_relationship_standard_group',
+      'label' => t('CiviCRM Group'),
+    ),
   );
+
   //Is Group Active?
   $data['civicrm_group']['is_active'] = array(
     'title' => t('Is Active'),
@@ -2891,8 +2923,23 @@ function _civicrm_core_data(&$data, $enabled) {
     ),
   );
 
+  $data['civicrm_group']['name'] = array(
+    'title' => t('Machine Name'),
+    'help' => t('Group Machine Name'),
+    'field' => array(
+      'handler' => 'views_handler_field',
+      'click sortable' => TRUE,
+    ),
+    'argument' => array(
+      'handler' => 'views_handler_argument',
+    ),
+    'filter' => array(
+      'handler' => 'civicrm_handler_filter_group_name',
+    ),
+  );
+
   $data['civicrm_group']['title'] = array(
-    'title' => t('Title'),
+    'title' => t('Title [Deprecated - Use Name or new Title]'),
     'help' => t('Group Title'),
     'real field' => 'id',
     'field' => array(
@@ -2913,6 +2960,23 @@ function _civicrm_core_data(&$data, $enabled) {
       'handler' => 'views_handler_sort',
     ),
   );
+
+  $data['civicrm_group']['title_'] = array(
+    'title' => t('Title'),
+    'help' => t('Group Title'),
+    'real field' => 'title',
+    'field' => array(
+      'handler' => 'views_handler_field',
+      'click sortable' => TRUE,
+    ),
+    'argument' => array(
+      'handler' => 'views_handler_argument',
+    ),
+    'sort' => array(
+      'handler' => 'views_handler_sort',
+    ),
+  );
+
   $data['civicrm_group']['description'] = array(
     'title' => t('Description'),
     'help' => t('Description of the Group'),

From 6fa55b734a6727d63e08d82575c199c54417ed1f Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Sun, 11 Feb 2018 10:54:22 +1100
Subject: [PATCH 76/86] Include new CiviCRM Group title field in filters

---
 .../civicrm_handler_filter_group_name.inc     | 20 +++---
 .../civicrm_handler_relationship_group.inc    | 71 +++++++++----------
 ...er_relationship_standard_group_contact.inc | 52 +++++++-------
 modules/views/components/civicrm.core.inc     |  4 ++
 4 files changed, 73 insertions(+), 74 deletions(-)

diff --git a/modules/views/civicrm/civicrm_handler_filter_group_name.inc b/modules/views/civicrm/civicrm_handler_filter_group_name.inc
index 8ff8dce..03a53ec 100644
--- a/modules/views/civicrm/civicrm_handler_filter_group_name.inc
+++ b/modules/views/civicrm/civicrm_handler_filter_group_name.inc
@@ -1,7 +1,7 @@
 <?php
 /*
   +--------------------------------------------------------------------+
-  | CiviCRM version 4.7                                                |
+  | CiviCRM version 5                                                  |
   +--------------------------------------------------------------------+
   | This file is a part of CiviCRM.                                    |
   |                                                                    |
@@ -39,14 +39,14 @@ class civicrm_handler_filter_group_name extends views_handler_filter_in_operator
         return;
       }
       $standard_or_smart = ($this->is_standard ? 'IS NULL' : 'IS NOT NULL');
-      $result = civicrm_api3('Group', 'get', array(
-          'return' => array("name", "title"),
-          'is_hidden' => 0,
-          'is_active' => 1,
-          'saved_search_id' => array($standard_or_smart => 1),
-          'options' => array('limit' => 0, 'sort' => "title"),
-      ));
-      $this->civi_groups = array();
+      $result = civicrm_api3('Group', 'get', [
+        'return' => ["name", "title"],
+        'is_hidden' => 0,
+        'is_active' => 1,
+        'saved_search_id' => [$standard_or_smart => 1],
+        'options' => ['limit' => 0, 'sort' => "title"],
+      ]);
+      $this->civi_groups = [];
       foreach ($result['values'] as $group) {
         if (isset($group['name'])) {
           $this->civi_groups[$group['name']] = $group['title'];
@@ -58,7 +58,7 @@ class civicrm_handler_filter_group_name extends views_handler_filter_in_operator
   public function get_value_options() {
     if (!isset($this->value_options)) {
       $this->value_title = t('Contact Group Title');
-      $options = array();
+      $options = [];
       foreach ($this->civi_groups as $name => $title) {
         $options[$name] = $title;
       }
diff --git a/modules/views/civicrm/civicrm_handler_relationship_group.inc b/modules/views/civicrm/civicrm_handler_relationship_group.inc
index 208c097..a84956c 100644
--- a/modules/views/civicrm/civicrm_handler_relationship_group.inc
+++ b/modules/views/civicrm/civicrm_handler_relationship_group.inc
@@ -6,7 +6,7 @@
  * to the join clause based on group_id, status, group title, is_active, group is standard group.
  */
 class civicrm_handler_relationship_group extends views_handler_relationship {
-  static $civi_group_types;
+  public static $civi_group_types;
   private $civi_groups;
   protected $is_standard;
 
@@ -23,16 +23,16 @@ class civicrm_handler_relationship_group extends views_handler_relationship {
     self::$civi_group_types = CRM_Contact_BAO_Group::buildOptions('group_type');
 
     $standard_or_smart = ($this->is_standard ? 'IS NULL' : 'IS NOT NULL');
-    $result = civicrm_api3('Group', 'get', array(
-        'return' => array("name", "title", "group_type"),
-        'is_hidden' => 0,
-        'is_active' => 1,
-        'saved_search_id' => array($standard_or_smart => 1),
-        'options' => array('limit' => 0, 'sort' => "title"),
-    ));
-    $this->civi_groups = array();
+    $result = civicrm_api3('Group', 'get', [
+      'return' => ["name", "title", "group_type"],
+      'is_hidden' => 0,
+      'is_active' => 1,
+      'saved_search_id' => [$standard_or_smart => 1],
+      'options' => ['limit' => 0, 'sort' => "title"],
+    ]);
+    $this->civi_groups = [];
     foreach ($result['values'] as $group) {
-      $group_types = array();
+      $group_types = [];
       if (!empty($group['group_type'])) {
         foreach ((array) $group['group_type'] as $type) {
           if (!empty($type)) {
@@ -51,7 +51,6 @@ class civicrm_handler_relationship_group extends views_handler_relationship {
     }
   }
 
-
   /**
    * Add additional options
    * to the view. By defining these here, Views will take care of saving the
@@ -59,8 +58,8 @@ class civicrm_handler_relationship_group extends views_handler_relationship {
    */
   public function option_definition() {
     $options = parent::option_definition();
-    $options['civi_group_type'] = array('default' => NULL);
-    $options['civi_group_name'] = array('default' => NULL);
+    $options['civi_group_type'] = ['default' => NULL];
+    $options['civi_group_name'] = ['default' => NULL];
     return $options;
   }
 
@@ -70,47 +69,45 @@ class civicrm_handler_relationship_group extends views_handler_relationship {
   public function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
 
-    $form['civi_group_type'] = array(
+    $form['civi_group_type'] = [
       '#type' => 'select',
       '#multiple' => TRUE,
       '#title' => 'Choose a specific group type',
       '#options' => self::$civi_group_types,
       '#description' => t('Choose to limit this relationship to one or more specific types of CiviCRM group.'),
       '#default_value' => $this->options['civi_group_type'],
-    );
-    $form['civi_group_name'] = array(
+    ];
+    $form['civi_group_name'] = [
       '#type' => 'select',
       '#multiple' => TRUE,
       '#title' => 'Choose a specific group',
       '#options' => $this->civi_groups,
       '#description' => t('Choose to limit this relationship to one or more specific CiviCRM groups.'),
       '#default_value' => $this->options['civi_group_name'],
-    );
+    ];
   }
 
-
-  public function join_required($join = array()) {
+  public function join_required($join = []) {
     if (!empty($this->options['required'])) {
       $join->type = 'INNER';
     }
     return $join;
   }
 
-
-  public function join_group_type($join = array()) {
-    $extra = array();
+  public function join_group_type($join = []) {
+    $extra = [];
     if (isset($join->extra)) {
       $extra = $join->extra;
     }
     if (isset($this->options['civi_group_type']) && $this->options['civi_group_type']) {
       $sep = CRM_Core_DAO::VALUE_SEPARATOR;
 
-      $extra[] = array(
+      $extra[] = [
         'value' => "($sep" . implode("$sep|$sep", $this->options['civi_group_type']) . "$sep)",
         'numeric' => FALSE,
         'field' => 'group_type',
         'operator' => 'RLIKE',
-      );
+      ];
     }
     if (!empty($extra)) {
       $join->extra = $extra;
@@ -118,17 +115,17 @@ class civicrm_handler_relationship_group extends views_handler_relationship {
     return $join;
   }
 
-  public function join_group_name($join = array()) {
-    $extra = array();
+  public function join_group_name($join = []) {
+    $extra = [];
     if (isset($join->extra)) {
       $extra = $join->extra;
     }
     if (isset($this->options['civi_group_name']) && $this->options['civi_group_name']) {
-      $extra[] = array(
+      $extra[] = [
         'value' => $this->options['civi_group_name'],
         'numeric' => FALSE,
         'field' => 'name',
-      );
+      ];
     }
     if (!empty($extra)) {
       $join->extra = $extra;
@@ -136,22 +133,21 @@ class civicrm_handler_relationship_group extends views_handler_relationship {
     return $join;
   }
 
-
-  public function join_group_active_not_hidden($join = array()) {
-    $extra = array();
+  public function join_group_active_not_hidden($join = []) {
+    $extra = [];
     if (isset($join->extra)) {
       $extra = $join->extra;
     }
-    $extra[] = array(
+    $extra[] = [
       'value' => 1,
       'numeric' => TRUE,
       'field' => 'is_active',
-    );
-    $extra[] = array(
+    ];
+    $extra[] = [
       'value' => 0,
       'numeric' => TRUE,
       'field' => 'is_hidden',
-    );
+    ];
 
     $join->extra = $extra;
     return $join;
@@ -166,7 +162,6 @@ class civicrm_handler_relationship_group extends views_handler_relationship {
     return $join;
   }
 
-
   /**
    * Called to implement a relationship in a query.
    */
@@ -175,11 +170,11 @@ class civicrm_handler_relationship_group extends views_handler_relationship {
     $this->alias = $this->query->add_table($this->table, $this->relationship, $join);
     //register relationship
     $this->view->relationship[$this->options['id']]->alias = $this->alias;
-    $this->query->relationships[$this->alias] = array(
+    $this->query->relationships[$this->alias] = [
       'link' => $this->relationship,
       'table' => $this->table,
       'base' => $this->table,
-    );
+    ];
 
   }
 
diff --git a/modules/views/civicrm/civicrm_handler_relationship_standard_group_contact.inc b/modules/views/civicrm/civicrm_handler_relationship_standard_group_contact.inc
index bf4305b..47005ae 100644
--- a/modules/views/civicrm/civicrm_handler_relationship_standard_group_contact.inc
+++ b/modules/views/civicrm/civicrm_handler_relationship_standard_group_contact.inc
@@ -6,9 +6,9 @@
  * to the join clause based on group_id, status, group title, is_active, group is standard group.
  */
 class civicrm_handler_relationship_standard_group_contact extends views_handler_relationship {
-  static $group_status;
-  private $group_ids = array();
-  private $group_titles = array();
+  public static $group_status;
+  private $group_ids = [];
+  private $group_titles = [];
 
   /**
    * Preload the list of group_types & titles and store in the static variables
@@ -24,13 +24,13 @@ class civicrm_handler_relationship_standard_group_contact extends views_handler_
       self::$group_status = CRM_Contact_BAO_GroupContact::buildOptions('status');
     }
 
-    $result = civicrm_api3('Group', 'get', array(
-        'return' => array("name", "title"),
-        'is_hidden' => 0,
-        'is_active' => 1,
-        'saved_search_id' => array('IS NULL' => 1),
-        'options' => array('limit' => 0, 'sort' => "title"),
-    ));
+    $result = civicrm_api3('Group', 'get', [
+      'return' => ["name", "title"],
+      'is_hidden' => 0,
+      'is_active' => 1,
+      'saved_search_id' => ['IS NULL' => 1],
+      'options' => ['limit' => 0, 'sort' => "title"],
+    ]);
     foreach ($result['values'] as $group) {
       if (isset($group['name'])) {
         $this->group_ids[$group['name']] = $group['id'];
@@ -46,8 +46,8 @@ class civicrm_handler_relationship_standard_group_contact extends views_handler_
    */
   public function option_definition() {
     $options = parent::option_definition();
-    $options['group_status'] = array('default' => 'Added');
-    $options['group_names'] = array('default' => NULL);
+    $options['group_status'] = ['default' => 'Added'];
+    $options['group_names'] = ['default' => NULL];
     return $options;
   }
 
@@ -57,53 +57,53 @@ class civicrm_handler_relationship_standard_group_contact extends views_handler_
   public function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
 
-    $form['group_status'] = array(
+    $form['group_status'] = [
       '#type' => 'select',
       '#multiple' => TRUE,
       '#title' => 'Choose a specific group status',
       '#options' => self::$group_status,
       '#description' => t('Choose to limit this relationship to one or more specific status of CiviCRM group.'),
       '#default_value' => $this->options['group_status'],
-    );
-    $form['group_names'] = array(
+    ];
+    $form['group_names'] = [
       '#type' => 'select',
       '#multiple' => TRUE,
       '#title' => 'Choose a specific group',
       '#options' => $this->group_titles,
       '#description' => t('Choose to limit this relationship to one or more specific CiviCRM groups.'),
       '#default_value' => $this->options['group_names'],
-    );
+    ];
   }
 
-  public function join_required($join = array()) {
+  public function join_required($join = []) {
     if (!empty($this->options['required'])) {
       $join->type = 'INNER';
     }
     return $join;
   }
 
-  public function join_group_contact($join = array()) {
-    $extra = array();
+  public function join_group_contact($join = []) {
+    $extra = [];
     if (isset($join->extra)) {
       $extra = $join->extra;
     }
     if (!empty($this->options['group_status'])) {
-      $extra[] = array(
+      $extra[] = [
         'value' => $this->options['group_status'],
         'numeric' => FALSE,
         'field' => 'status',
-      );
+      ];
     }
     if (!empty($this->options['group_names'])) {
-      $values = array();
+      $values = [];
       foreach (array_keys($this->options['group_names']) as $name) {
         $values[] = $this->group_ids[$name];
       }
-      $extra[] = array(
+      $extra[] = [
         'value' => $values,
         'numeric' => TRUE,
         'field' => 'group_id',
-      );
+      ];
     }
     if (!empty($extra)) {
       $join->extra = $extra;
@@ -126,11 +126,11 @@ class civicrm_handler_relationship_standard_group_contact extends views_handler_
     $this->alias = $this->query->add_table($this->table, $this->relationship, $join);
     //register relationship
     $this->view->relationship[$this->options['id']]->alias = $this->alias;
-    $this->query->relationships[$this->alias] = array(
+    $this->query->relationships[$this->alias] = [
       'link' => $this->relationship,
       'table' => $this->table,
       'base' => $this->table,
-    );
+    ];
   }
 
 }
diff --git a/modules/views/components/civicrm.core.inc b/modules/views/components/civicrm.core.inc
index d60d22f..f2b4c5c 100644
--- a/modules/views/components/civicrm.core.inc
+++ b/modules/views/components/civicrm.core.inc
@@ -2972,6 +2972,10 @@ function _civicrm_core_data(&$data, $enabled) {
     'argument' => array(
       'handler' => 'views_handler_argument',
     ),
+    'filter' => array(
+      'handler' => 'views_handler_filter_string',
+      'allow empty' => TRUE,
+    ),
     'sort' => array(
       'handler' => 'views_handler_sort',
     ),

From e622e077d32a87f0604131d3cf9acee94e7dac44 Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Thu, 25 Jul 2019 10:42:52 +1000
Subject: [PATCH 77/86] Update civicrmtheme module to use new isFrontEndPage
 function on userSystem

---
 modules/civicrmtheme/civicrmtheme.module | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/modules/civicrmtheme/civicrmtheme.module b/modules/civicrmtheme/civicrmtheme.module
index ba34d85..62934d8 100644
--- a/modules/civicrmtheme/civicrmtheme.module
+++ b/modules/civicrmtheme/civicrmtheme.module
@@ -117,17 +117,10 @@ function civicrmtheme_custom_theme() {
     return;
   }
 
-  // Get the menu items.
-  $args = explode('?', $_GET['q']);
-  $path = $args[0];
-
-  // Get the menu for above URL.
-  $item = CRM_Core_Menu::get($path);
-
   // Check for public pages
   // If public page and civicrm public theme is set, apply civicrm public theme
   // If user does not have access to CiviCRM use the public page for the error message
-  if (!user_access('access CiviCRM') || CRM_Utils_Array::value('is_public', $item)) {
+  if (!user_access('access CiviCRM') || CRM_Core_Config::singleton()->userSystem->isFrontEndPage()) {
     if ($public_theme) {
       return $public_theme;
     }

From 47582b701a0d53dd08ce47dd7bb47af8f1eb51e0 Mon Sep 17 00:00:00 2001
From: Jamie McClelland <jm@mayfirst.org>
Date: Fri, 26 Jul 2019 10:11:06 -0400
Subject: [PATCH 78/86] providing clear indication that module is deprecated.

https://lab.civicrm.org/dev/drupal/issues/59
---
 modules/civicrm_engage/civicrm_engage.info | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/civicrm_engage/civicrm_engage.info b/modules/civicrm_engage/civicrm_engage.info
index 3fd1235..22ebe99 100755
--- a/modules/civicrm_engage/civicrm_engage.info
+++ b/modules/civicrm_engage/civicrm_engage.info
@@ -1,5 +1,5 @@
 name = CiviEngage
-description = Walklist and Phone-banking support for CiviCRM.
+description = DEPRECATED Walklist and Phone-banking support for CiviCRM. This module will not be ported to Drupal 8. Please see: https://civicrm.org/blog/jamie/civicrmengage-is-dead-long-live-civicrmengage
 version = 7.x-4.7
 core = 7.x
 package = CiviCRM

From 1b623020213d3f8c5135b86843e5876f8de25767 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Mon, 19 Aug 2019 17:43:06 -0700
Subject: [PATCH 79/86] (dev/drupal#79) Fail more gracefully when upgrading on
 PHP 5.x

This version requirement officially went up to PHP 7.0 circa Civi 5.14.
However, at that time, the upgrade metadata was kept at PHP 5.6 to allow
somewhat softer landing for stragglers.  That's no longer possible in Civi
5.16+,

This just gives a clearer error when someone tries to upgrade with PHP 5.x.

Before
------

When upgrading via drush or Drupal web UI on PHP 5.6, the Civi class-loader fails to initialize.

```
Parse error: syntax error, unexpected ':', expecting '{' in /Users/totten/bknix/build/dmaster/web/sites/all/modules/civicrm/vendor/league/csv/src/functions.php on line 33
```

(Approximate call-path: `civicrm.drush.inc | civicrm.module` =>
`civicrm.settings.php` => `CRM_Core_ClassLoader` => `vendor/autoload.php` =>
`vendor/league/csv/src/functions.php`)

After
-----

When upgrading via drush on PHP 5.6, the error points to the actual problem.

```
[bknix-old:~/bknix/build/dmaster/web/sites/all/modules/civicrm] drush civicrm-upgrade-db
CiviCRM requires PHP 7.0.0+. Drush is running PHP 5.6.38.                                                                                                                [error]
```

When upgrading via web UI on PHP 5.6, the error message is similar:

```
CiviCRM requires PHP 7.0.0+. The web server is running PHP 5.6.38.
```

(Note: I tweaked the text to emphasize that the PHP version is determined by
the "drush" or "web server" environment - in some systems, these are
different environments with different PHP versions.  A phrase like "your
version" can be confusing/misleading in those cases.)

Comments
--------

The canonical representation of the minimum PHP version is in
`$civicrm_root/CRM/Upgrade/Form.php`.  However, correctly reading that
metadata requires loading `civicrm.settings.php`, which triggers the crash.

To work around this, we reproduce the constant and use a unit-test to ensure
its continued accuracy.

Also, it seems useful to put the same metadata in `civicrm.info`.  I'm not
sure if D7 uses this in a meaningful way, but it's good to be accurate.
---
 civicrm.info                                |  2 +-
 civicrm.module                              | 18 +++++++--
 drush/civicrm.drush.inc                     |  7 ++++
 tests/phpunit/CiviDrupal/PhpVersionTest.php | 43 +++++++++++++++++++++
 4 files changed, 66 insertions(+), 4 deletions(-)
 create mode 100644 tests/phpunit/CiviDrupal/PhpVersionTest.php

diff --git a/civicrm.info b/civicrm.info
index 02a50ab..5cb1182 100644
--- a/civicrm.info
+++ b/civicrm.info
@@ -4,7 +4,7 @@ version = 7.x-4.7
 package = CiviCRM
 core = 7.x
 project = civicrm
-php = 5.6
+php = 7.0
 
 files[] = civicrm.module
 files[] = civicrm.install
diff --git a/civicrm.module b/civicrm.module
index 5308e9f..1047610 100644
--- a/civicrm.module
+++ b/civicrm.module
@@ -32,6 +32,19 @@ require_once 'civicrm_user.inc';
 
 define('CIVICRM_UF_HEAD', TRUE);
 
+/**
+ * Minimum required PHP
+ *
+ * Note: This duplicates CRM_Upgrade_Form::MINIMUM_PHP_VERSION. The
+ * duplication helps avoid a dependency-loop. (Reading `Form::MINIMUM_PHP_VERSION`
+ * requires loading `civicrm.settings.php`, but that triggers a parse-error
+ * on PHP 5.x.)
+ *
+ * @see CRM_Upgrade_Form::MINIMUM_PHP_VERSION
+ * @see CiviDrupal\PhpVersionTest::testConstantMatch()
+ */
+define('CIVICRM_DRUPAL_PHP_MINIMUM', '7.0.0');
+
 /**
  * Adds CiviCRM CSS and JS resources into the header.
  */
@@ -149,9 +162,8 @@ function civicrm_page_build($page) {
  */
 function civicrm_initialize() {
   // Check for php version and ensure its greater than minPhpVersion
-  $minPhpVersion = '5.3.4';
-  if (version_compare(PHP_VERSION, $minPhpVersion) < 0) {
-    echo "CiviCRM requires PHP Version $minPhpVersion or greater. You are running PHP Version " . PHP_VERSION . "<p>";
+  if (version_compare(PHP_VERSION, CIVICRM_DRUPAL_PHP_MINIMUM) < 0) {
+    echo "CiviCRM requires PHP " . CIVICRM_DRUPAL_PHP_MINIMUM . "+. The web server is running PHP " . PHP_VERSION . ".<p>";
     exit();
   }
   _civicrm_registerClassLoader();
diff --git a/drush/civicrm.drush.inc b/drush/civicrm.drush.inc
index 39aac0e..5a3dbc0 100644
--- a/drush/civicrm.drush.inc
+++ b/drush/civicrm.drush.inc
@@ -1456,6 +1456,13 @@ function _civicrm_init($fail = TRUE, $load_config = TRUE) {
     return $init;
   }
 
+  if (!version_compare(phpversion(), CIVICRM_DRUPAL_PHP_MINIMUM, '>=')) {
+    return drush_set_error('CIVICRM_PHP_MINIMUM', dt('CiviCRM requires PHP @required+. Drush is running PHP @current.', [
+      '@current' => phpversion(),
+      '@required' => CIVICRM_DRUPAL_PHP_MINIMUM,
+    ]));
+  }
+
   global $cmsPath;
   $cmsPath = $drupal_root = drush_get_context('DRUSH_DRUPAL_ROOT');
   $site_root = drush_get_context('DRUSH_DRUPAL_SITE_ROOT', FALSE);
diff --git a/tests/phpunit/CiviDrupal/PhpVersionTest.php b/tests/phpunit/CiviDrupal/PhpVersionTest.php
new file mode 100644
index 0000000..3e7c8ad
--- /dev/null
+++ b/tests/phpunit/CiviDrupal/PhpVersionTest.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace CiviDrupal;
+
+use Civi\Test\EndToEndInterface;
+
+class PhpVersionTest extends \PHPUnit_Framework_TestCase implements EndToEndInterface {
+
+  /**
+   * CIVICRM_DRUPAL_PHP_MINIMUM (civicrm.module) should match MINIMUM_PHP_VERSION (CRM/Upgrade/Form.php).
+   */
+  public function testConstantMatch() {
+    $constantFile = $this->getDrupalModulePath() . '/civicrm.module';
+    $this->assertFileExists($constantFile);
+    $content = file_get_contents($constantFile);
+    if (preg_match(";define\\('CIVICRM_DRUPAL_PHP_MINIMUM', '(.*)'\\);", $content, $m)) {
+      $this->assertEquals(\CRM_Upgrade_Form::MINIMUM_PHP_VERSION, $m[1]);
+    }
+    else {
+      $this->fail('Failed to find CIVICRM_DRUPAL_PHP_MINIMUM in ' . $constantFile);
+    }
+  }
+
+  /**
+   * "php" requirement (civicrm.info) should match MINIMUM_PHP_VERSION (CRM/Upgrade/Form.php).
+   */
+  public function testInfoMatch() {
+    $infoFile = $this->getDrupalModulePath() . '/civicrm.info';
+    $this->assertFileExists($infoFile);
+    $info = drupal_parse_info_file($infoFile);
+    $expectMajorMinor = preg_replace(';^(\d+\.\d+)\..*$;', '\1', \CRM_Upgrade_Form::MINIMUM_PHP_VERSION);
+    $this->assertEquals($expectMajorMinor, $info['php']);
+  }
+
+  /**
+   * @return string
+   *   Ex: '/var/www/sites/all/modules/civicrm/drupal'
+   */
+  protected function getDrupalModulePath() {
+    return dirname(dirname(dirname(__DIR__)));
+  }
+
+}

From df199716d6d5eabf6a721943e86dba98f5b22d49 Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Thu, 7 Nov 2019 13:19:31 +1100
Subject: [PATCH 80/86] Update copyright date for 2020

---
 civicrm.install                                               | 4 ++--
 civicrm.module                                                | 2 +-
 drush/civicrm.drush.inc                                       | 4 ++--
 modules/civicrm_engage/Engage/Report/Form/CallList.php        | 4 ++--
 modules/civicrm_engage/Engage/Report/Form/List.php            | 4 ++--
 modules/civicrm_engage/Engage/Report/Form/WalkList.php        | 4 ++--
 modules/civicrm_engage/civicrm_engage.install                 | 4 ++--
 modules/civicrm_engage/civicrm_engage.module                  | 4 ++--
 .../templates/CRM/Contact/Form/Edit/Demographics.tpl          | 2 +-
 .../templates/CRM/Contact/Form/Inline/Demographics.tpl        | 2 +-
 .../templates/CRM/Contact/Page/Inline/Demographics.tpl        | 2 +-
 modules/civicrm_og_sync/civicrm_og_sync.install               | 4 ++--
 modules/civicrm_og_sync/civicrm_og_sync.module                | 4 ++--
 modules/civicrm_rules/civicrm_rules.contact-eval.inc          | 4 ++--
 modules/civicrm_rules/civicrm_rules.event-eval.inc            | 4 ++--
 modules/civicrm_rules/civicrm_rules.install                   | 4 ++--
 modules/civicrm_rules/civicrm_rules.mailing-eval.inc          | 4 ++--
 modules/civicrm_rules/civicrm_rules.module                    | 4 ++--
 modules/civicrm_rules/civicrm_rules.participant-eval.inc      | 4 ++--
 modules/civicrm_rules/civicrm_rules.rules.inc                 | 4 ++--
 modules/civicrm_rules/civicrm_rules_action.inc                | 4 ++--
 modules/civicrm_rules/civicrm_rules_condition.inc             | 4 ++--
 modules/civicrm_rules/civicrm_rules_entity.inc                | 4 ++--
 modules/civicrm_rules/civicrm_rules_event.inc                 | 4 ++--
 modules/civicrm_rules/civicrm_rules_utils.inc                 | 4 ++--
 modules/civicrmtheme/civicrmtheme.install                     | 4 ++--
 modules/civicrmtheme/civicrmtheme.module                      | 4 ++--
 27 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/civicrm.install b/civicrm.install
index 8a9a7e3..eaad2c5 100644
--- a/civicrm.install
+++ b/civicrm.install
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2019                                |
+ | Copyright CiviCRM LLC (c) 2004-2020                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2019
+ * @copyright CiviCRM LLC (c) 2004-2020
  * $Id$
  *
  */
diff --git a/civicrm.module b/civicrm.module
index 5308e9f..f2bd912 100644
--- a/civicrm.module
+++ b/civicrm.module
@@ -26,7 +26,7 @@
  * Drupal module file.
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2019
+ * @copyright CiviCRM LLC (c) 2004-2020
  */
 require_once 'civicrm_user.inc';
 
diff --git a/drush/civicrm.drush.inc b/drush/civicrm.drush.inc
index 39aac0e..158fc67 100644
--- a/drush/civicrm.drush.inc
+++ b/drush/civicrm.drush.inc
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2019                                |
+ | Copyright CiviCRM LLC (c) 2004-2020                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2019
+ * @copyright CiviCRM LLC (c) 2004-2020
  */
 
 /**
diff --git a/modules/civicrm_engage/Engage/Report/Form/CallList.php b/modules/civicrm_engage/Engage/Report/Form/CallList.php
index d40aba9..528ab5d 100644
--- a/modules/civicrm_engage/Engage/Report/Form/CallList.php
+++ b/modules/civicrm_engage/Engage/Report/Form/CallList.php
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2019                                |
+ | Copyright CiviCRM LLC (c) 2004-2020                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2019
+ * @copyright CiviCRM LLC (c) 2004-2020
  * @copyright DharmaTech  (c) 2009
  * $Id$
  *
diff --git a/modules/civicrm_engage/Engage/Report/Form/List.php b/modules/civicrm_engage/Engage/Report/Form/List.php
index a49193c..2f7be11 100644
--- a/modules/civicrm_engage/Engage/Report/Form/List.php
+++ b/modules/civicrm_engage/Engage/Report/Form/List.php
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2019                                |
+ | Copyright CiviCRM LLC (c) 2004-2020                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2019
+ * @copyright CiviCRM LLC (c) 2004-2020
  * @copyright DharmaTech  (c) 2009
  * $Id$
  *
diff --git a/modules/civicrm_engage/Engage/Report/Form/WalkList.php b/modules/civicrm_engage/Engage/Report/Form/WalkList.php
index 77afdb4..35de0b8 100644
--- a/modules/civicrm_engage/Engage/Report/Form/WalkList.php
+++ b/modules/civicrm_engage/Engage/Report/Form/WalkList.php
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2019                                |
+ | Copyright CiviCRM LLC (c) 2004-2020                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2019
+ * @copyright CiviCRM LLC (c) 2004-2020
  * @copyright DharmaTech  (c) 2009
  * $Id$
  *
diff --git a/modules/civicrm_engage/civicrm_engage.install b/modules/civicrm_engage/civicrm_engage.install
index e346910..7094cc5 100644
--- a/modules/civicrm_engage/civicrm_engage.install
+++ b/modules/civicrm_engage/civicrm_engage.install
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2019                                |
+ | Copyright CiviCRM LLC (c) 2004-2020                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2019
+ * @copyright CiviCRM LLC (c) 2004-2020
  * $Id$
  *
  */
diff --git a/modules/civicrm_engage/civicrm_engage.module b/modules/civicrm_engage/civicrm_engage.module
index 9825e82..afcb772 100644
--- a/modules/civicrm_engage/civicrm_engage.module
+++ b/modules/civicrm_engage/civicrm_engage.module
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2019                                |
+ | Copyright CiviCRM LLC (c) 2004-2020                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2019
+ * @copyright CiviCRM LLC (c) 2004-2020
  * $Id$
  *
  */
diff --git a/modules/civicrm_engage/templates/CRM/Contact/Form/Edit/Demographics.tpl b/modules/civicrm_engage/templates/CRM/Contact/Form/Edit/Demographics.tpl
index e414588..cd6ce01 100644
--- a/modules/civicrm_engage/templates/CRM/Contact/Form/Edit/Demographics.tpl
+++ b/modules/civicrm_engage/templates/CRM/Contact/Form/Edit/Demographics.tpl
@@ -2,7 +2,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2019                                |
+ | Copyright CiviCRM LLC (c) 2004-2020                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
diff --git a/modules/civicrm_engage/templates/CRM/Contact/Form/Inline/Demographics.tpl b/modules/civicrm_engage/templates/CRM/Contact/Form/Inline/Demographics.tpl
index 19f43a8..049e95a 100644
--- a/modules/civicrm_engage/templates/CRM/Contact/Form/Inline/Demographics.tpl
+++ b/modules/civicrm_engage/templates/CRM/Contact/Form/Inline/Demographics.tpl
@@ -2,7 +2,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2019                                |
+ | Copyright CiviCRM LLC (c) 2004-2020                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
diff --git a/modules/civicrm_engage/templates/CRM/Contact/Page/Inline/Demographics.tpl b/modules/civicrm_engage/templates/CRM/Contact/Page/Inline/Demographics.tpl
index 5d82122..d33b2fd 100644
--- a/modules/civicrm_engage/templates/CRM/Contact/Page/Inline/Demographics.tpl
+++ b/modules/civicrm_engage/templates/CRM/Contact/Page/Inline/Demographics.tpl
@@ -2,7 +2,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2019                                |
+ | Copyright CiviCRM LLC (c) 2004-2020                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
diff --git a/modules/civicrm_og_sync/civicrm_og_sync.install b/modules/civicrm_og_sync/civicrm_og_sync.install
index 17e7df3..5c03748 100644
--- a/modules/civicrm_og_sync/civicrm_og_sync.install
+++ b/modules/civicrm_og_sync/civicrm_og_sync.install
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2019                                |
+ | Copyright CiviCRM LLC (c) 2004-2020                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2019
+ * @copyright CiviCRM LLC (c) 2004-2020
  * $Id$
  *
  */
diff --git a/modules/civicrm_og_sync/civicrm_og_sync.module b/modules/civicrm_og_sync/civicrm_og_sync.module
index 0ee8cc5..57e1aa8 100644
--- a/modules/civicrm_og_sync/civicrm_og_sync.module
+++ b/modules/civicrm_og_sync/civicrm_og_sync.module
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2019                                |
+ | Copyright CiviCRM LLC (c) 2004-2020                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2019
+ * @copyright CiviCRM LLC (c) 2004-2020
  * $Id$
  *
  */
diff --git a/modules/civicrm_rules/civicrm_rules.contact-eval.inc b/modules/civicrm_rules/civicrm_rules.contact-eval.inc
index fee5174..98a1f7e 100644
--- a/modules/civicrm_rules/civicrm_rules.contact-eval.inc
+++ b/modules/civicrm_rules/civicrm_rules.contact-eval.inc
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2019                                |
+ | Copyright CiviCRM LLC (c) 2004-2020                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2019
+ * @copyright CiviCRM LLC (c) 2004-2020
  * $Id$
  *
  */
diff --git a/modules/civicrm_rules/civicrm_rules.event-eval.inc b/modules/civicrm_rules/civicrm_rules.event-eval.inc
index 43ee68a..19a69c5 100644
--- a/modules/civicrm_rules/civicrm_rules.event-eval.inc
+++ b/modules/civicrm_rules/civicrm_rules.event-eval.inc
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2019                                |
+ | Copyright CiviCRM LLC (c) 2004-2020                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2019
+ * @copyright CiviCRM LLC (c) 2004-2020
  * $Id$
  *
  */
diff --git a/modules/civicrm_rules/civicrm_rules.install b/modules/civicrm_rules/civicrm_rules.install
index 4335284..8666f82 100644
--- a/modules/civicrm_rules/civicrm_rules.install
+++ b/modules/civicrm_rules/civicrm_rules.install
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2019                                |
+ | Copyright CiviCRM LLC (c) 2004-2020                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2019
+ * @copyright CiviCRM LLC (c) 2004-2020
  * $Id$
  *
  */
diff --git a/modules/civicrm_rules/civicrm_rules.mailing-eval.inc b/modules/civicrm_rules/civicrm_rules.mailing-eval.inc
index f230ab1..d746172 100644
--- a/modules/civicrm_rules/civicrm_rules.mailing-eval.inc
+++ b/modules/civicrm_rules/civicrm_rules.mailing-eval.inc
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2019                                |
+ | Copyright CiviCRM LLC (c) 2004-2020                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2019
+ * @copyright CiviCRM LLC (c) 2004-2020
  * $Id$
  *
  */
diff --git a/modules/civicrm_rules/civicrm_rules.module b/modules/civicrm_rules/civicrm_rules.module
index d65ca82..fa0d44c 100644
--- a/modules/civicrm_rules/civicrm_rules.module
+++ b/modules/civicrm_rules/civicrm_rules.module
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2019                                |
+ | Copyright CiviCRM LLC (c) 2004-2020                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2019
+ * @copyright CiviCRM LLC (c) 2004-2020
  * $Id$
  *
  */
diff --git a/modules/civicrm_rules/civicrm_rules.participant-eval.inc b/modules/civicrm_rules/civicrm_rules.participant-eval.inc
index d0d0c9a..2b2a67f 100644
--- a/modules/civicrm_rules/civicrm_rules.participant-eval.inc
+++ b/modules/civicrm_rules/civicrm_rules.participant-eval.inc
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2019                                |
+ | Copyright CiviCRM LLC (c) 2004-2020                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2019
+ * @copyright CiviCRM LLC (c) 2004-2020
  * $Id$
  *
  */
diff --git a/modules/civicrm_rules/civicrm_rules.rules.inc b/modules/civicrm_rules/civicrm_rules.rules.inc
index a0ee2c0..0cf0e81 100644
--- a/modules/civicrm_rules/civicrm_rules.rules.inc
+++ b/modules/civicrm_rules/civicrm_rules.rules.inc
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2019                                |
+ | Copyright CiviCRM LLC (c) 2004-2020                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2019
+ * @copyright CiviCRM LLC (c) 2004-2020
  * $Id$
  *
  */
diff --git a/modules/civicrm_rules/civicrm_rules_action.inc b/modules/civicrm_rules/civicrm_rules_action.inc
index a3ed67e..b83bd9f 100644
--- a/modules/civicrm_rules/civicrm_rules_action.inc
+++ b/modules/civicrm_rules/civicrm_rules_action.inc
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2019                                |
+ | Copyright CiviCRM LLC (c) 2004-2020                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2019
+ * @copyright CiviCRM LLC (c) 2004-2020
  * $Id$
  *
  */
diff --git a/modules/civicrm_rules/civicrm_rules_condition.inc b/modules/civicrm_rules/civicrm_rules_condition.inc
index 00ecc37..603515f 100644
--- a/modules/civicrm_rules/civicrm_rules_condition.inc
+++ b/modules/civicrm_rules/civicrm_rules_condition.inc
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2019                                |
+ | Copyright CiviCRM LLC (c) 2004-2020                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2019
+ * @copyright CiviCRM LLC (c) 2004-2020
  * $Id$
  *
  */
diff --git a/modules/civicrm_rules/civicrm_rules_entity.inc b/modules/civicrm_rules/civicrm_rules_entity.inc
index b49d2c6..35d0301 100644
--- a/modules/civicrm_rules/civicrm_rules_entity.inc
+++ b/modules/civicrm_rules/civicrm_rules_entity.inc
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2019                                |
+ | Copyright CiviCRM LLC (c) 2004-2020                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2019
+ * @copyright CiviCRM LLC (c) 2004-2020
  * $Id$
  *
  */
diff --git a/modules/civicrm_rules/civicrm_rules_event.inc b/modules/civicrm_rules/civicrm_rules_event.inc
index 82d45bb..827e65c 100644
--- a/modules/civicrm_rules/civicrm_rules_event.inc
+++ b/modules/civicrm_rules/civicrm_rules_event.inc
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2019                                |
+ | Copyright CiviCRM LLC (c) 2004-2020                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2019
+ * @copyright CiviCRM LLC (c) 2004-2020
  * $Id$
  *
  */
diff --git a/modules/civicrm_rules/civicrm_rules_utils.inc b/modules/civicrm_rules/civicrm_rules_utils.inc
index 37a2737..7ed8472 100644
--- a/modules/civicrm_rules/civicrm_rules_utils.inc
+++ b/modules/civicrm_rules/civicrm_rules_utils.inc
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2019                                |
+ | Copyright CiviCRM LLC (c) 2004-2020                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2019
+ * @copyright CiviCRM LLC (c) 2004-2020
  * $Id$
  *
  */
diff --git a/modules/civicrmtheme/civicrmtheme.install b/modules/civicrmtheme/civicrmtheme.install
index ffe5056..7e0beef 100644
--- a/modules/civicrmtheme/civicrmtheme.install
+++ b/modules/civicrmtheme/civicrmtheme.install
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2019                                |
+ | Copyright CiviCRM LLC (c) 2004-2020                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2019
+ * @copyright CiviCRM LLC (c) 2004-2020
  * $Id$
  *
  */
diff --git a/modules/civicrmtheme/civicrmtheme.module b/modules/civicrmtheme/civicrmtheme.module
index 62934d8..a2e5d0d 100644
--- a/modules/civicrmtheme/civicrmtheme.module
+++ b/modules/civicrmtheme/civicrmtheme.module
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2019                                |
+ | Copyright CiviCRM LLC (c) 2004-2020                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2019
+ * @copyright CiviCRM LLC (c) 2004-2020
  * $Id$
  *
  */

From 56dae36c9f486fcbd40867e9b33f09b2ea16663d Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Wed, 13 Nov 2019 19:18:13 -0800
Subject: [PATCH 81/86] (NFC) (dev/core#878) Simplify copyright header

https://lab.civicrm.org/dev/core/issues/878
---
 civicrm.install                               | 26 ++++---------------
 civicrm.module                                |  2 +-
 drush/civicrm.drush.inc                       | 26 ++++---------------
 .../Engage/Report/Form/CallList.php           | 26 ++++---------------
 .../Engage/Report/Form/List.php               | 26 ++++---------------
 .../Engage/Report/Form/WalkList.php           | 26 ++++---------------
 modules/civicrm_engage/civicrm_engage.install | 26 ++++---------------
 modules/civicrm_engage/civicrm_engage.module  | 26 ++++---------------
 .../CRM/Contact/Form/Edit/Demographics.tpl    | 24 +++--------------
 .../CRM/Contact/Form/Inline/Demographics.tpl  | 24 +++--------------
 .../CRM/Contact/Page/Inline/Demographics.tpl  | 24 +++--------------
 modules/civicrm_member_roles/CHANGELOG.txt    |  2 +-
 .../civicrm_og_sync/civicrm_og_sync.install   | 26 ++++---------------
 .../civicrm_og_sync/civicrm_og_sync.module    | 26 ++++---------------
 .../civicrm_rules.contact-eval.inc            | 26 ++++---------------
 .../civicrm_rules.event-eval.inc              | 26 ++++---------------
 modules/civicrm_rules/civicrm_rules.install   | 26 ++++---------------
 .../civicrm_rules.mailing-eval.inc            | 26 ++++---------------
 modules/civicrm_rules/civicrm_rules.module    | 26 ++++---------------
 .../civicrm_rules.participant-eval.inc        | 26 ++++---------------
 modules/civicrm_rules/civicrm_rules.rules.inc | 26 ++++---------------
 .../civicrm_rules/civicrm_rules_action.inc    | 26 ++++---------------
 .../civicrm_rules/civicrm_rules_condition.inc | 26 ++++---------------
 .../civicrm_rules/civicrm_rules_entity.inc    | 26 ++++---------------
 modules/civicrm_rules/civicrm_rules_event.inc | 26 ++++---------------
 modules/civicrm_rules/civicrm_rules_utils.inc | 26 ++++---------------
 modules/civicrmtheme/civicrmtheme.install     | 26 ++++---------------
 modules/civicrmtheme/civicrmtheme.module      | 26 ++++---------------
 28 files changed, 129 insertions(+), 545 deletions(-)

diff --git a/civicrm.install b/civicrm.install
index eaad2c5..d949c66 100644
--- a/civicrm.install
+++ b/civicrm.install
@@ -1,34 +1,18 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 5                                                  |
- +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2020                                |
- +--------------------------------------------------------------------+
- | 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.        |
+ | Copyright CiviCRM LLC. All rights reserved.                        |
  |                                                                    |
- | 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        |
+ | This work is published under the GNU AGPLv3 license with some      |
+ | permitted exceptions and without any warranty. For full license    |
+ | and copyright information, see https://civicrm.org/licensing       |
  +--------------------------------------------------------------------+
  */
 
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2020
+ * @copyright CiviCRM LLC https://civicrm.org/licensing
  * $Id$
  *
  */
diff --git a/civicrm.module b/civicrm.module
index f2bd912..5b0d3d8 100644
--- a/civicrm.module
+++ b/civicrm.module
@@ -26,7 +26,7 @@
  * Drupal module file.
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2020
+ * @copyright CiviCRM LLC https://civicrm.org/licensing
  */
 require_once 'civicrm_user.inc';
 
diff --git a/drush/civicrm.drush.inc b/drush/civicrm.drush.inc
index 158fc67..69eddb6 100644
--- a/drush/civicrm.drush.inc
+++ b/drush/civicrm.drush.inc
@@ -1,34 +1,18 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 5                                                  |
- +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2020                                |
- +--------------------------------------------------------------------+
- | 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.        |
+ | Copyright CiviCRM LLC. All rights reserved.                        |
  |                                                                    |
- | 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        |
+ | This work is published under the GNU AGPLv3 license with some      |
+ | permitted exceptions and without any warranty. For full license    |
+ | and copyright information, see https://civicrm.org/licensing       |
  +--------------------------------------------------------------------+
  */
 
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2020
+ * @copyright CiviCRM LLC https://civicrm.org/licensing
  */
 
 /**
diff --git a/modules/civicrm_engage/Engage/Report/Form/CallList.php b/modules/civicrm_engage/Engage/Report/Form/CallList.php
index 528ab5d..4ce7cc8 100644
--- a/modules/civicrm_engage/Engage/Report/Form/CallList.php
+++ b/modules/civicrm_engage/Engage/Report/Form/CallList.php
@@ -1,34 +1,18 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 5                                                  |
- +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2020                                |
- +--------------------------------------------------------------------+
- | 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.        |
+ | Copyright CiviCRM LLC. All rights reserved.                        |
  |                                                                    |
- | 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        |
+ | This work is published under the GNU AGPLv3 license with some      |
+ | permitted exceptions and without any warranty. For full license    |
+ | and copyright information, see https://civicrm.org/licensing       |
  +--------------------------------------------------------------------+
  */
 
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2020
+ * @copyright CiviCRM LLC https://civicrm.org/licensing
  * @copyright DharmaTech  (c) 2009
  * $Id$
  *
diff --git a/modules/civicrm_engage/Engage/Report/Form/List.php b/modules/civicrm_engage/Engage/Report/Form/List.php
index 2f7be11..ca0367f 100644
--- a/modules/civicrm_engage/Engage/Report/Form/List.php
+++ b/modules/civicrm_engage/Engage/Report/Form/List.php
@@ -1,34 +1,18 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 5                                                  |
- +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2020                                |
- +--------------------------------------------------------------------+
- | 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.        |
+ | Copyright CiviCRM LLC. All rights reserved.                        |
  |                                                                    |
- | 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        |
+ | This work is published under the GNU AGPLv3 license with some      |
+ | permitted exceptions and without any warranty. For full license    |
+ | and copyright information, see https://civicrm.org/licensing       |
  +--------------------------------------------------------------------+
  */
 
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2020
+ * @copyright CiviCRM LLC https://civicrm.org/licensing
  * @copyright DharmaTech  (c) 2009
  * $Id$
  *
diff --git a/modules/civicrm_engage/Engage/Report/Form/WalkList.php b/modules/civicrm_engage/Engage/Report/Form/WalkList.php
index 35de0b8..1f20468 100644
--- a/modules/civicrm_engage/Engage/Report/Form/WalkList.php
+++ b/modules/civicrm_engage/Engage/Report/Form/WalkList.php
@@ -1,34 +1,18 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 5                                                  |
- +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2020                                |
- +--------------------------------------------------------------------+
- | 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.        |
+ | Copyright CiviCRM LLC. All rights reserved.                        |
  |                                                                    |
- | 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        |
+ | This work is published under the GNU AGPLv3 license with some      |
+ | permitted exceptions and without any warranty. For full license    |
+ | and copyright information, see https://civicrm.org/licensing       |
  +--------------------------------------------------------------------+
  */
 
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2020
+ * @copyright CiviCRM LLC https://civicrm.org/licensing
  * @copyright DharmaTech  (c) 2009
  * $Id$
  *
diff --git a/modules/civicrm_engage/civicrm_engage.install b/modules/civicrm_engage/civicrm_engage.install
index 7094cc5..95da7ea 100644
--- a/modules/civicrm_engage/civicrm_engage.install
+++ b/modules/civicrm_engage/civicrm_engage.install
@@ -1,34 +1,18 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 5                                                  |
- +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2020                                |
- +--------------------------------------------------------------------+
- | 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.        |
+ | Copyright CiviCRM LLC. All rights reserved.                        |
  |                                                                    |
- | 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        |
+ | This work is published under the GNU AGPLv3 license with some      |
+ | permitted exceptions and without any warranty. For full license    |
+ | and copyright information, see https://civicrm.org/licensing       |
  +--------------------------------------------------------------------+
  */
 
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2020
+ * @copyright CiviCRM LLC https://civicrm.org/licensing
  * $Id$
  *
  */
diff --git a/modules/civicrm_engage/civicrm_engage.module b/modules/civicrm_engage/civicrm_engage.module
index afcb772..70c0658 100644
--- a/modules/civicrm_engage/civicrm_engage.module
+++ b/modules/civicrm_engage/civicrm_engage.module
@@ -1,34 +1,18 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 5                                                  |
- +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2020                                |
- +--------------------------------------------------------------------+
- | 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.        |
+ | Copyright CiviCRM LLC. All rights reserved.                        |
  |                                                                    |
- | 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        |
+ | This work is published under the GNU AGPLv3 license with some      |
+ | permitted exceptions and without any warranty. For full license    |
+ | and copyright information, see https://civicrm.org/licensing       |
  +--------------------------------------------------------------------+
  */
 
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2020
+ * @copyright CiviCRM LLC https://civicrm.org/licensing
  * $Id$
  *
  */
diff --git a/modules/civicrm_engage/templates/CRM/Contact/Form/Edit/Demographics.tpl b/modules/civicrm_engage/templates/CRM/Contact/Form/Edit/Demographics.tpl
index cd6ce01..bfa277c 100644
--- a/modules/civicrm_engage/templates/CRM/Contact/Form/Edit/Demographics.tpl
+++ b/modules/civicrm_engage/templates/CRM/Contact/Form/Edit/Demographics.tpl
@@ -1,26 +1,10 @@
 {*
  +--------------------------------------------------------------------+
- | CiviCRM version 5                                                  |
- +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2020                                |
- +--------------------------------------------------------------------+
- | 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.        |
+ | Copyright CiviCRM LLC. All rights reserved.                        |
  |                                                                    |
- | 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        |
+ | This work is published under the GNU AGPLv3 license with some      |
+ | permitted exceptions and without any warranty. For full license    |
+ | and copyright information, see https://civicrm.org/licensing       |
  +--------------------------------------------------------------------+
 *}
 <div class="crm-accordion-wrapper crm-demographics-accordion collapsed">
diff --git a/modules/civicrm_engage/templates/CRM/Contact/Form/Inline/Demographics.tpl b/modules/civicrm_engage/templates/CRM/Contact/Form/Inline/Demographics.tpl
index 049e95a..9dc82ba 100644
--- a/modules/civicrm_engage/templates/CRM/Contact/Form/Inline/Demographics.tpl
+++ b/modules/civicrm_engage/templates/CRM/Contact/Form/Inline/Demographics.tpl
@@ -1,26 +1,10 @@
 {*
  +--------------------------------------------------------------------+
- | CiviCRM version 5                                                  |
- +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2020                                |
- +--------------------------------------------------------------------+
- | 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.        |
+ | Copyright CiviCRM LLC. All rights reserved.                        |
  |                                                                    |
- | 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        |
+ | This work is published under the GNU AGPLv3 license with some      |
+ | permitted exceptions and without any warranty. For full license    |
+ | and copyright information, see https://civicrm.org/licensing       |
  +--------------------------------------------------------------------+
 *}
 {$form.oplock_ts.html}
diff --git a/modules/civicrm_engage/templates/CRM/Contact/Page/Inline/Demographics.tpl b/modules/civicrm_engage/templates/CRM/Contact/Page/Inline/Demographics.tpl
index d33b2fd..c198980 100644
--- a/modules/civicrm_engage/templates/CRM/Contact/Page/Inline/Demographics.tpl
+++ b/modules/civicrm_engage/templates/CRM/Contact/Page/Inline/Demographics.tpl
@@ -1,26 +1,10 @@
 {*
  +--------------------------------------------------------------------+
- | CiviCRM version 5                                                  |
- +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2020                                |
- +--------------------------------------------------------------------+
- | 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.        |
+ | Copyright CiviCRM LLC. All rights reserved.                        |
  |                                                                    |
- | 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        |
+ | This work is published under the GNU AGPLv3 license with some      |
+ | permitted exceptions and without any warranty. For full license    |
+ | and copyright information, see https://civicrm.org/licensing       |
  +--------------------------------------------------------------------+
 *}
 <div id="crm-demographic-content" {if $permission EQ 'edit'} class="crm-inline-edit" data-dependent-fields='["#crm-contactname-content"]' data-edit-params='{ldelim}"cid": "{$contactId}", "class_name": "CRM_Contact_Form_Inline_Demographics"{rdelim}'{/if}>
diff --git a/modules/civicrm_member_roles/CHANGELOG.txt b/modules/civicrm_member_roles/CHANGELOG.txt
index 1c9c54d..e5c286b 100644
--- a/modules/civicrm_member_roles/CHANGELOG.txt
+++ b/modules/civicrm_member_roles/CHANGELOG.txt
@@ -55,4 +55,4 @@ _____________________________________
 civimember_roles 5.x-1.0-beta1
 _____________________________________
 
-- Initial version published on Drupal.org.
\ No newline at end of file
+- Initial version published on Drupal.org.
diff --git a/modules/civicrm_og_sync/civicrm_og_sync.install b/modules/civicrm_og_sync/civicrm_og_sync.install
index 5c03748..0cfce80 100644
--- a/modules/civicrm_og_sync/civicrm_og_sync.install
+++ b/modules/civicrm_og_sync/civicrm_og_sync.install
@@ -1,34 +1,18 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 5                                                  |
- +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2020                                |
- +--------------------------------------------------------------------+
- | 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.        |
+ | Copyright CiviCRM LLC. All rights reserved.                        |
  |                                                                    |
- | 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        |
+ | This work is published under the GNU AGPLv3 license with some      |
+ | permitted exceptions and without any warranty. For full license    |
+ | and copyright information, see https://civicrm.org/licensing       |
  +--------------------------------------------------------------------+
  */
 
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2020
+ * @copyright CiviCRM LLC https://civicrm.org/licensing
  * $Id$
  *
  */
diff --git a/modules/civicrm_og_sync/civicrm_og_sync.module b/modules/civicrm_og_sync/civicrm_og_sync.module
index 57e1aa8..44a1489 100644
--- a/modules/civicrm_og_sync/civicrm_og_sync.module
+++ b/modules/civicrm_og_sync/civicrm_og_sync.module
@@ -1,34 +1,18 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 5                                                  |
- +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2020                                |
- +--------------------------------------------------------------------+
- | 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.        |
+ | Copyright CiviCRM LLC. All rights reserved.                        |
  |                                                                    |
- | 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        |
+ | This work is published under the GNU AGPLv3 license with some      |
+ | permitted exceptions and without any warranty. For full license    |
+ | and copyright information, see https://civicrm.org/licensing       |
  +--------------------------------------------------------------------+
  */
 
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2020
+ * @copyright CiviCRM LLC https://civicrm.org/licensing
  * $Id$
  *
  */
diff --git a/modules/civicrm_rules/civicrm_rules.contact-eval.inc b/modules/civicrm_rules/civicrm_rules.contact-eval.inc
index 98a1f7e..6cf7ce6 100644
--- a/modules/civicrm_rules/civicrm_rules.contact-eval.inc
+++ b/modules/civicrm_rules/civicrm_rules.contact-eval.inc
@@ -1,34 +1,18 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 5                                                  |
- +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2020                                |
- +--------------------------------------------------------------------+
- | 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.        |
+ | Copyright CiviCRM LLC. All rights reserved.                        |
  |                                                                    |
- | 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        |
+ | This work is published under the GNU AGPLv3 license with some      |
+ | permitted exceptions and without any warranty. For full license    |
+ | and copyright information, see https://civicrm.org/licensing       |
  +--------------------------------------------------------------------+
  */
 
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2020
+ * @copyright CiviCRM LLC https://civicrm.org/licensing
  * $Id$
  *
  */
diff --git a/modules/civicrm_rules/civicrm_rules.event-eval.inc b/modules/civicrm_rules/civicrm_rules.event-eval.inc
index 19a69c5..5e8c767 100644
--- a/modules/civicrm_rules/civicrm_rules.event-eval.inc
+++ b/modules/civicrm_rules/civicrm_rules.event-eval.inc
@@ -1,34 +1,18 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 5                                                  |
- +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2020                                |
- +--------------------------------------------------------------------+
- | 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.        |
+ | Copyright CiviCRM LLC. All rights reserved.                        |
  |                                                                    |
- | 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        |
+ | This work is published under the GNU AGPLv3 license with some      |
+ | permitted exceptions and without any warranty. For full license    |
+ | and copyright information, see https://civicrm.org/licensing       |
  +--------------------------------------------------------------------+
  */
 
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2020
+ * @copyright CiviCRM LLC https://civicrm.org/licensing
  * $Id$
  *
  */
diff --git a/modules/civicrm_rules/civicrm_rules.install b/modules/civicrm_rules/civicrm_rules.install
index 8666f82..2308a40 100644
--- a/modules/civicrm_rules/civicrm_rules.install
+++ b/modules/civicrm_rules/civicrm_rules.install
@@ -1,34 +1,18 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 5                                                  |
- +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2020                                |
- +--------------------------------------------------------------------+
- | 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.        |
+ | Copyright CiviCRM LLC. All rights reserved.                        |
  |                                                                    |
- | 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        |
+ | This work is published under the GNU AGPLv3 license with some      |
+ | permitted exceptions and without any warranty. For full license    |
+ | and copyright information, see https://civicrm.org/licensing       |
  +--------------------------------------------------------------------+
  */
 
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2020
+ * @copyright CiviCRM LLC https://civicrm.org/licensing
  * $Id$
  *
  */
diff --git a/modules/civicrm_rules/civicrm_rules.mailing-eval.inc b/modules/civicrm_rules/civicrm_rules.mailing-eval.inc
index d746172..706226d 100644
--- a/modules/civicrm_rules/civicrm_rules.mailing-eval.inc
+++ b/modules/civicrm_rules/civicrm_rules.mailing-eval.inc
@@ -1,34 +1,18 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 5                                                  |
- +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2020                                |
- +--------------------------------------------------------------------+
- | 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.        |
+ | Copyright CiviCRM LLC. All rights reserved.                        |
  |                                                                    |
- | 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        |
+ | This work is published under the GNU AGPLv3 license with some      |
+ | permitted exceptions and without any warranty. For full license    |
+ | and copyright information, see https://civicrm.org/licensing       |
  +--------------------------------------------------------------------+
  */
 
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2020
+ * @copyright CiviCRM LLC https://civicrm.org/licensing
  * $Id$
  *
  */
diff --git a/modules/civicrm_rules/civicrm_rules.module b/modules/civicrm_rules/civicrm_rules.module
index fa0d44c..c86737c 100644
--- a/modules/civicrm_rules/civicrm_rules.module
+++ b/modules/civicrm_rules/civicrm_rules.module
@@ -1,34 +1,18 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 5                                                  |
- +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2020                                |
- +--------------------------------------------------------------------+
- | 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.        |
+ | Copyright CiviCRM LLC. All rights reserved.                        |
  |                                                                    |
- | 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        |
+ | This work is published under the GNU AGPLv3 license with some      |
+ | permitted exceptions and without any warranty. For full license    |
+ | and copyright information, see https://civicrm.org/licensing       |
  +--------------------------------------------------------------------+
  */
 
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2020
+ * @copyright CiviCRM LLC https://civicrm.org/licensing
  * $Id$
  *
  */
diff --git a/modules/civicrm_rules/civicrm_rules.participant-eval.inc b/modules/civicrm_rules/civicrm_rules.participant-eval.inc
index 2b2a67f..6e9576f 100644
--- a/modules/civicrm_rules/civicrm_rules.participant-eval.inc
+++ b/modules/civicrm_rules/civicrm_rules.participant-eval.inc
@@ -1,34 +1,18 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 5                                                  |
- +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2020                                |
- +--------------------------------------------------------------------+
- | 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.        |
+ | Copyright CiviCRM LLC. All rights reserved.                        |
  |                                                                    |
- | 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        |
+ | This work is published under the GNU AGPLv3 license with some      |
+ | permitted exceptions and without any warranty. For full license    |
+ | and copyright information, see https://civicrm.org/licensing       |
  +--------------------------------------------------------------------+
  */
 
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2020
+ * @copyright CiviCRM LLC https://civicrm.org/licensing
  * $Id$
  *
  */
diff --git a/modules/civicrm_rules/civicrm_rules.rules.inc b/modules/civicrm_rules/civicrm_rules.rules.inc
index 0cf0e81..a812943 100644
--- a/modules/civicrm_rules/civicrm_rules.rules.inc
+++ b/modules/civicrm_rules/civicrm_rules.rules.inc
@@ -1,34 +1,18 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 5                                                  |
- +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2020                                |
- +--------------------------------------------------------------------+
- | 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.        |
+ | Copyright CiviCRM LLC. All rights reserved.                        |
  |                                                                    |
- | 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        |
+ | This work is published under the GNU AGPLv3 license with some      |
+ | permitted exceptions and without any warranty. For full license    |
+ | and copyright information, see https://civicrm.org/licensing       |
  +--------------------------------------------------------------------+
  */
 
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2020
+ * @copyright CiviCRM LLC https://civicrm.org/licensing
  * $Id$
  *
  */
diff --git a/modules/civicrm_rules/civicrm_rules_action.inc b/modules/civicrm_rules/civicrm_rules_action.inc
index b83bd9f..3df1473 100644
--- a/modules/civicrm_rules/civicrm_rules_action.inc
+++ b/modules/civicrm_rules/civicrm_rules_action.inc
@@ -1,34 +1,18 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 5                                                  |
- +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2020                                |
- +--------------------------------------------------------------------+
- | 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.        |
+ | Copyright CiviCRM LLC. All rights reserved.                        |
  |                                                                    |
- | 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        |
+ | This work is published under the GNU AGPLv3 license with some      |
+ | permitted exceptions and without any warranty. For full license    |
+ | and copyright information, see https://civicrm.org/licensing       |
  +--------------------------------------------------------------------+
  */
 
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2020
+ * @copyright CiviCRM LLC https://civicrm.org/licensing
  * $Id$
  *
  */
diff --git a/modules/civicrm_rules/civicrm_rules_condition.inc b/modules/civicrm_rules/civicrm_rules_condition.inc
index 603515f..7624329 100644
--- a/modules/civicrm_rules/civicrm_rules_condition.inc
+++ b/modules/civicrm_rules/civicrm_rules_condition.inc
@@ -1,34 +1,18 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 5                                                  |
- +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2020                                |
- +--------------------------------------------------------------------+
- | 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.        |
+ | Copyright CiviCRM LLC. All rights reserved.                        |
  |                                                                    |
- | 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        |
+ | This work is published under the GNU AGPLv3 license with some      |
+ | permitted exceptions and without any warranty. For full license    |
+ | and copyright information, see https://civicrm.org/licensing       |
  +--------------------------------------------------------------------+
  */
 
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2020
+ * @copyright CiviCRM LLC https://civicrm.org/licensing
  * $Id$
  *
  */
diff --git a/modules/civicrm_rules/civicrm_rules_entity.inc b/modules/civicrm_rules/civicrm_rules_entity.inc
index 35d0301..7b425fb 100644
--- a/modules/civicrm_rules/civicrm_rules_entity.inc
+++ b/modules/civicrm_rules/civicrm_rules_entity.inc
@@ -1,34 +1,18 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 5                                                  |
- +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2020                                |
- +--------------------------------------------------------------------+
- | 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.        |
+ | Copyright CiviCRM LLC. All rights reserved.                        |
  |                                                                    |
- | 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        |
+ | This work is published under the GNU AGPLv3 license with some      |
+ | permitted exceptions and without any warranty. For full license    |
+ | and copyright information, see https://civicrm.org/licensing       |
  +--------------------------------------------------------------------+
  */
 
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2020
+ * @copyright CiviCRM LLC https://civicrm.org/licensing
  * $Id$
  *
  */
diff --git a/modules/civicrm_rules/civicrm_rules_event.inc b/modules/civicrm_rules/civicrm_rules_event.inc
index 827e65c..086705a 100644
--- a/modules/civicrm_rules/civicrm_rules_event.inc
+++ b/modules/civicrm_rules/civicrm_rules_event.inc
@@ -1,34 +1,18 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 5                                                  |
- +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2020                                |
- +--------------------------------------------------------------------+
- | 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.        |
+ | Copyright CiviCRM LLC. All rights reserved.                        |
  |                                                                    |
- | 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        |
+ | This work is published under the GNU AGPLv3 license with some      |
+ | permitted exceptions and without any warranty. For full license    |
+ | and copyright information, see https://civicrm.org/licensing       |
  +--------------------------------------------------------------------+
  */
 
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2020
+ * @copyright CiviCRM LLC https://civicrm.org/licensing
  * $Id$
  *
  */
diff --git a/modules/civicrm_rules/civicrm_rules_utils.inc b/modules/civicrm_rules/civicrm_rules_utils.inc
index 7ed8472..7343055 100644
--- a/modules/civicrm_rules/civicrm_rules_utils.inc
+++ b/modules/civicrm_rules/civicrm_rules_utils.inc
@@ -1,34 +1,18 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 5                                                  |
- +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2020                                |
- +--------------------------------------------------------------------+
- | 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.        |
+ | Copyright CiviCRM LLC. All rights reserved.                        |
  |                                                                    |
- | 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        |
+ | This work is published under the GNU AGPLv3 license with some      |
+ | permitted exceptions and without any warranty. For full license    |
+ | and copyright information, see https://civicrm.org/licensing       |
  +--------------------------------------------------------------------+
  */
 
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2020
+ * @copyright CiviCRM LLC https://civicrm.org/licensing
  * $Id$
  *
  */
diff --git a/modules/civicrmtheme/civicrmtheme.install b/modules/civicrmtheme/civicrmtheme.install
index 7e0beef..097c5be 100644
--- a/modules/civicrmtheme/civicrmtheme.install
+++ b/modules/civicrmtheme/civicrmtheme.install
@@ -1,34 +1,18 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 5                                                  |
- +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2020                                |
- +--------------------------------------------------------------------+
- | 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.        |
+ | Copyright CiviCRM LLC. All rights reserved.                        |
  |                                                                    |
- | 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        |
+ | This work is published under the GNU AGPLv3 license with some      |
+ | permitted exceptions and without any warranty. For full license    |
+ | and copyright information, see https://civicrm.org/licensing       |
  +--------------------------------------------------------------------+
  */
 
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2020
+ * @copyright CiviCRM LLC https://civicrm.org/licensing
  * $Id$
  *
  */
diff --git a/modules/civicrmtheme/civicrmtheme.module b/modules/civicrmtheme/civicrmtheme.module
index a2e5d0d..72cad3b 100644
--- a/modules/civicrmtheme/civicrmtheme.module
+++ b/modules/civicrmtheme/civicrmtheme.module
@@ -1,34 +1,18 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 5                                                  |
- +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2020                                |
- +--------------------------------------------------------------------+
- | 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.        |
+ | Copyright CiviCRM LLC. All rights reserved.                        |
  |                                                                    |
- | 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        |
+ | This work is published under the GNU AGPLv3 license with some      |
+ | permitted exceptions and without any warranty. For full license    |
+ | and copyright information, see https://civicrm.org/licensing       |
  +--------------------------------------------------------------------+
  */
 
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2020
+ * @copyright CiviCRM LLC https://civicrm.org/licensing
  * $Id$
  *
  */

From 0aa94359c1b23a18626c6fe4a282279e6b28f113 Mon Sep 17 00:00:00 2001
From: magnolia61 <richard.van.oosterhout@gmail.com>
Date: Fri, 22 Nov 2019 11:12:04 +0100
Subject: [PATCH 82/86] Add participant is_test field to views

---
 modules/views/components/civicrm.event.inc | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/modules/views/components/civicrm.event.inc b/modules/views/components/civicrm.event.inc
index 2c8fc69..035a841 100644
--- a/modules/views/components/civicrm.event.inc
+++ b/modules/views/components/civicrm.event.inc
@@ -579,6 +579,25 @@ function _civicrm_event_data(&$data, $enabled) {
     'name' => 'register_date',
   ));
 
+  //BOOLEAN : IS test registration
+  $data['civicrm_participant']['is_test'] = array(
+    'title' => t('Test Registration?'),
+    'help' => t('Is this a test registration?'),
+    'field' => array(
+      'handler' => 'views_handler_field_boolean',
+      'click sortable' => TRUE,
+    ),
+    'argument' => array(
+      'handler' => 'views_handler_argument',
+    ),
+    'filter' => array(
+      'handler' => 'views_handler_filter_boolean_operator',
+    ),
+    'sort' => array(
+      'handler' => 'views_handler_sort',
+    ),
+  );
+
   //BOOLEAN : IS SET TO PAY LATER
   $data['civicrm_participant']['is_pay_later'] = array(
     'title' => t('Is Pay Later'),

From 4c6225332511cf23d9aa539aa3410eb277e9e004 Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Wed, 18 Dec 2019 05:43:18 +1100
Subject: [PATCH 83/86] Update unit tests to use name spaced format of phpunit
 test classes for phpunit6 compatability

---
 tests/phpunit/CiviDrupal/HookTest.php       | 2 +-
 tests/phpunit/CiviDrupal/PhpVersionTest.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/phpunit/CiviDrupal/HookTest.php b/tests/phpunit/CiviDrupal/HookTest.php
index 034863b..cf73eae 100644
--- a/tests/phpunit/CiviDrupal/HookTest.php
+++ b/tests/phpunit/CiviDrupal/HookTest.php
@@ -9,7 +9,7 @@
    * @package CiviDrupal
    * @group e2e
    */
-  class HookTest extends \PHPUnit_Framework_TestCase implements EndToEndInterface {
+  class HookTest extends \PHPUnit\Framework\TestCase implements EndToEndInterface {
 
     public function testFoo() {
       $arg1 = 'hello';
diff --git a/tests/phpunit/CiviDrupal/PhpVersionTest.php b/tests/phpunit/CiviDrupal/PhpVersionTest.php
index 3e7c8ad..92b67f1 100644
--- a/tests/phpunit/CiviDrupal/PhpVersionTest.php
+++ b/tests/phpunit/CiviDrupal/PhpVersionTest.php
@@ -4,7 +4,7 @@
 
 use Civi\Test\EndToEndInterface;
 
-class PhpVersionTest extends \PHPUnit_Framework_TestCase implements EndToEndInterface {
+class PhpVersionTest extends \PHPUnit\Framework\TestCase implements EndToEndInterface {
 
   /**
    * CIVICRM_DRUPAL_PHP_MINIMUM (civicrm.module) should match MINIMUM_PHP_VERSION (CRM/Upgrade/Form.php).

From 33d24b373f3dd011b132db2fe6a57c97fea9e23a Mon Sep 17 00:00:00 2001
From: demeritcowboy <demeritcowboy@hotmail.com>
Date: Mon, 6 Jan 2020 01:02:58 -0500
Subject: [PATCH 84/86] Fix 404 wiki link

---
 modules/civicrm_og_sync/civicrm_og_sync.info | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/civicrm_og_sync/civicrm_og_sync.info b/modules/civicrm_og_sync/civicrm_og_sync.info
index a8249d0..2c390be 100644
--- a/modules/civicrm_og_sync/civicrm_og_sync.info
+++ b/modules/civicrm_og_sync/civicrm_og_sync.info
@@ -1,5 +1,5 @@
 name = CiviCRM OG Sync
-description = Synchronize Organic Groups and CiviCRM Groups and ACL's. More information at: http://wiki.civicrm.org/confluence/display/CRMDOC/CiviCRM+vs.+Organic+Groups
+description = Synchronize Organic Groups and CiviCRM Groups and ACL's. More information at: https://docs.civicrm.org/sysadmin/en/latest/integration/drupal/#civicrm-organic-groups-sync
 version = 7.x-4.7
 core = 7.x
 package = CiviCRM

From b49cc1ed75477b848a3b9adca27a29122d41147b Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Sun, 26 Jan 2020 11:28:27 +1100
Subject: [PATCH 85/86] [NFC] Doc Block fix should be bool no boolean as per
 coding standards

---
 modules/civicrm_engage/Engage/Report/Form/List.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/civicrm_engage/Engage/Report/Form/List.php b/modules/civicrm_engage/Engage/Report/Form/List.php
index ca0367f..9a72d2e 100644
--- a/modules/civicrm_engage/Engage/Report/Form/List.php
+++ b/modules/civicrm_engage/Engage/Report/Form/List.php
@@ -37,19 +37,19 @@ class Engage_Report_Form_List extends CRM_Report_Form {
 
   /**
    * Address information needed in output
-   * @var boolean
+   * @var bool
    */
   protected $_addressField = FALSE;
 
   /**
    * Email address needed in output
-   * @var boolean
+   * @var bool
    */
   protected $_emailField = FALSE;
 
   /**
    * Demographic information needed in output
-   * @var boolean
+   * @var bool
    */
   protected $_demoField = FALSE;
 
@@ -57,19 +57,19 @@ class Engage_Report_Form_List extends CRM_Report_Form {
 
   /**
    * Phone number needed in output
-   * @var boolean
+   * @var bool
    */
   protected $_phoneField = FALSE;
 
   /**
    * Group membership information needed in output
-   * @var boolean
+   * @var bool
    */
   protected $_groupField = FALSE;
 
   /**
    * Voter Info information needed in output
-   * @var boolean
+   * @var bool
    */
   protected $_voterInfoField = FALSE;
 

From d13b084b7a3c7b4b968c5eb753d0279c3b6f0082 Mon Sep 17 00:00:00 2001
From: Herb vd Dool <herb@3speedhub.com>
Date: Fri, 6 Mar 2020 08:58:44 -0500
Subject: [PATCH 86/86] change some drupals to backdrops that were missed

---
 civicrm.module          | 10 +++++-----
 drush/civicrm.drush.inc |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/civicrm.module b/civicrm.module
index 7667d37..71d40b7 100644
--- a/civicrm.module
+++ b/civicrm.module
@@ -41,9 +41,9 @@ define('CIVICRM_UF_HEAD', TRUE);
  * on PHP 5.x.)
  *
  * @see CRM_Upgrade_Form::MINIMUM_PHP_VERSION
- * @see CiviDrupal\PhpVersionTest::testConstantMatch()
+ * @see CiviBackdrop\PhpVersionTest::testConstantMatch()
  */
-define('CIVICRM_DRUPAL_PHP_MINIMUM', '7.0.0');
+define('CIVICRM_BACKDROP_PHP_MINIMUM', '7.0.0');
 
 /**
  * Adds CiviCRM CSS and JS resources into the header.
@@ -229,8 +229,8 @@ function civicrm_profile_form_validate($form, &$form_state) {
  */
 function civicrm_initialize() {
   // Check for php version and ensure its greater than minPhpVersion
-  if (version_compare(PHP_VERSION, CIVICRM_DRUPAL_PHP_MINIMUM) < 0) {
-    echo "CiviCRM requires PHP " . CIVICRM_DRUPAL_PHP_MINIMUM . "+. The web server is running PHP " . PHP_VERSION . ".<p>";
+  if (version_compare(PHP_VERSION, CIVICRM_BACKDROP_PHP_MINIMUM) < 0) {
+    echo "CiviCRM requires PHP " . CIVICRM_BACKDROP_PHP_MINIMUM . "+. The web server is running PHP " . PHP_VERSION . ".<p>";
     exit();
   }
   _civicrm_registerClassLoader();
@@ -601,7 +601,7 @@ function civicrm_user_form_validate($form, &$form_state) {
   // lets suppress key generation for all validation also
   civicrm_key_disable();
 
-  $validated = &drupal_static(__FUNCTION__, FALSE);
+  $validated = &backdrop_static(__FUNCTION__, FALSE);
 
   if ($validated) {
     return;
diff --git a/drush/civicrm.drush.inc b/drush/civicrm.drush.inc
index e4abac1..f2ab1fb 100644
--- a/drush/civicrm.drush.inc
+++ b/drush/civicrm.drush.inc
@@ -1426,10 +1426,10 @@ function _civicrm_init($fail = TRUE, $load_config = TRUE) {
     return $init;
   }
 
-  if (!version_compare(phpversion(), CIVICRM_DRUPAL_PHP_MINIMUM, '>=')) {
+  if (!version_compare(phpversion(), CIVICRM_BACKDROP_PHP_MINIMUM, '>=')) {
     return drush_set_error('CIVICRM_PHP_MINIMUM', dt('CiviCRM requires PHP @required+. Drush is running PHP @current.', [
       '@current' => phpversion(),
-      '@required' => CIVICRM_DRUPAL_PHP_MINIMUM,
+      '@required' => CIVICRM_BACKDROP_PHP_MINIMUM,
     ]));
   }