Issue #110 bring up to date with 7.x-master

civicrm.module

@@ -163,7 +163,7 @@ function civicrm_menu_alter(&$items) {
  * Display profile form in tabs on user account
  */
 function civicrm_profile_form($form, &$form_state, $account, $profile_name) {
-  $output = civicrm_form_data($account, $profile_name, TRUE);
+  $output = civicrm_form_data($form, $account, $profile_name, TRUE);
   if (!empty($output)) {
     $form['#attributes']['enctype'] = 'multipart/form-data';
     $form = array_merge($form, $output);
@@ -601,7 +601,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;
@@ -610,10 +610,9 @@ 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') ||
-      (arg(0) == 'admin' && arg(1) == 'people' && arg(2) == 'create')
-    ) ? TRUE : FALSE;
+  $register = ((arg(0) == 'user' && arg(1) == 'register') ||
+    (arg(0) == 'admin' && arg(1) == 'people' && arg(2) == 'create')
+  ) ? TRUE : FALSE;
   $userID = NULL;
   if (!empty($form['#user'])) {
     $userID = CRM_Core_BAO_UFMatch::getContactId($form['#user']->uid);
@@ -631,14 +630,16 @@ function civicrm_user_form_validate($form, &$form_state) {
 /**
  * Retrieve the CiviCRM profile forms
  *
+ * @param $edit
+ *   Form array.
  * @param $account
  * @param $profile
  * @param $reset
  * @param $doNotProcess
  *
  * @return array $output
  */
-function civicrm_form_data($account, $profile, $reset, $doNotProcess = FALSE) {
+function civicrm_form_data($edit, $account, $profile, $reset, $doNotProcess = FALSE) {
   // lets suppress key generation for all CMS forms
   civicrm_key_disable();
 
@@ -667,10 +668,10 @@ function civicrm_form_data($account, $profile, $reset, $doNotProcess = FALSE) {
     // 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');
@@ -873,6 +874,7 @@ function civicrm_autoload_info() {
     'civicrm_handler_filter_datetime' => 'modules/views/civicrm/civicrm_handler_filter_datetime.inc',
     'civicrm_handler_filter_domain' => 'modules/views/civicrm/civicrm_handler_filter_domain.inc',
     'civicrm_handler_filter_encounter_medium' => 'modules/views/civicrm/civicrm_handler_filter_encounter_medium.inc',
+    'civicrm_handler_filter_group_name' => 'modules/views/civicrm/civicrm_handler_filter_group_name.inc',
     'civicrm_handler_filter_group_status' => 'modules/views/civicrm/civicrm_handler_filter_group_status.inc',
     'civicrm_handler_filter_option' => 'modules/views/civicrm/civicrm_handler_filter_option.inc',
     'civicrm_handler_filter_pseudo_constant' => 'modules/views/civicrm/civicrm_handler_filter_pseudo_constant.inc',
@@ -884,14 +886,17 @@ function civicrm_autoload_info() {
     'civicrm_handler_relationship' => 'modules/views/civicrm/civicrm_handler_relationship.inc',
     'civicrm_handler_relationship_address' => 'modules/views/civicrm/civicrm_handler_relationship_address.inc',
     'civicrm_handler_relationship_contact2users' => 'modules/views/civicrm/civicrm_handler_relationship_contact2users.inc',
+    'civicrm_handler_relationship_group' => 'modules/views/civicrm/civicrm_handler_relationship_group.inc',
     'civicrm_handler_relationship_im' => 'modules/views/civicrm/civicrm_handler_relationship_im.inc',
     'civicrm_handler_relationship_location' => 'modules/views/civicrm/civicrm_handler_relationship_location.inc',
     'civicrm_handler_relationship_mail' => 'modules/views/civicrm/civicrm_handler_relationship_mail.inc',
     'civicrm_handler_relationship_memberships_contributions' => 'modules/views/civicrm/civicrm_handler_relationship_memberships_contributions.inc',
+    'civicrm_handler_relationship_participant' => 'modules/views/civicrm/civicrm_handler_relationship_participant.inc',
     'civicrm_handler_relationship_phone' => 'modules/views/civicrm/civicrm_handler_relationship_phone.inc',
     'civicrm_handler_relationship_relationship' => 'modules/views/civicrm/civicrm_handler_relationship_relationship.inc',
+    'civicrm_handler_relationship_standard_group_contact' => 'modules/views/civicrm/civicrm_handler_relationship_standard_group_contact.inc',
+    'civicrm_handler_relationship_standard_group' => 'modules/views/civicrm/civicrm_handler_relationship_standard_group.inc',
     'civicrm_handler_relationship_website' => 'modules/views/civicrm/civicrm_handler_relationship_website.inc',
-    'civicrm_handler_relationship_participant' => 'modules/views/civicrm/civicrm_handler_relationship_participant.inc',
 
     // sort handlers
     'civicrm_handler_sort_address_pseudoconstant' => 'modules/views/civicrm/civicrm_handler_sort_address_pseudoconstant.inc',

modules/civicrm_engage/Engage/Report/Form/List.php

@@ -13,6 +13,7 @@
  *
  * @package CRM
  * @copyright CiviCRM LLC https://civicrm.org/licensing
+ * @copyright DharmaTech  (c) 2009
  * $Id$
  *
  */
@@ -36,39 +37,39 @@ 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;
 
   protected $_coreField = FALSE;
 
   /**
    * 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;
 

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. Please see: https://civicrm.org/blog/jamie/civicrmengage-is-dead-long-live-civicrmengage
 version = 1.x-4.7
 backdrop = 1.x
 type = module

modules/civicrm_group_roles/civicrm_group_roles.module

@@ -651,9 +651,9 @@ function civicrm_group_roles_add_remove_groups($account, $roles, $op) {
     //end if contact_id
 
     else {
-      watchdog('civicrm_group_roles', 'CiviCRM contact not found for Backdrop user ID @id', array('@id' => $user->uid), WATCHDOG_ERROR);
+      watchdog('civicrm_group_roles', 'CiviCRM contact not found for Backdrop user ID @id', array('@id' => $account->uid), WATCHDOG_ERROR);
       if ($debug_mode) {
-        backdrop_set_message(t('CiviCRM contact not found for Backdrop user ID @id', array('@id' => $user->uid)));
+        backdrop_set_message(t('CiviCRM contact not found for Backdrop user ID @id', array('@id' => $account->uid)));
       }
     }
 

modules/civicrm_rules/civicrm_rules.contact-eval.inc

@@ -130,3 +130,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;
+}

modules/civicrm_rules/civicrm_rules_action.inc

@@ -80,7 +80,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'),

modules/civicrmtheme/civicrmtheme.module

@@ -137,17 +137,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;
     }

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) {

modules/views/civicrm/civicrm_handler_field_activity.inc

@@ -29,8 +29,7 @@
  * @ingroup civicrm_field_handlers
  */
 class civicrm_handler_field_activity extends civicrm_handler_field {
-
-  static $_recordType;
+  public static $_recordType;
 
   public function construct() {
     parent::construct();

modules/views/civicrm/civicrm_handler_field_country.inc

@@ -32,9 +32,8 @@
  *
  */
 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();

modules/views/civicrm/civicrm_handler_field_county.inc

@@ -30,8 +30,7 @@
  *
  */
 class civicrm_handler_field_county extends civicrm_handler_field_address {
-
-  static $_counties;
+  public static $_counties;
 
   public function construct() {
     parent::construct();

modules/views/civicrm/civicrm_handler_field_email.inc

@@ -58,7 +58,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});

modules/views/civicrm/civicrm_handler_field_encounter_medium.inc

@@ -31,8 +31,7 @@
  *
  */
 class civicrm_handler_field_encounter_medium extends views_handler_field {
-
-  static $_encounter_medium;
+  public static $_encounter_medium;
 
   public function construct() {
     parent::construct();

modules/views/civicrm/civicrm_handler_field_file.inc

@@ -66,6 +66,11 @@ class civicrm_handler_field_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);
+
       $fileHash = CRM_Core_BAO_File::generateFileHash($value, $fileId);
       return CRM_Utils_System::url($path,
         "id={$fileId}&eid={$value}&fcs={$fileHash}",

modules/views/civicrm/civicrm_handler_field_option.inc

@@ -29,8 +29,7 @@
  * @ingroup civicrm_field_handlers
  */
 class civicrm_handler_field_option extends civicrm_handler_field {
-
-  static $_options;
+  public static $_options;
 
   public function render($values) {
     $this->initialize();

modules/views/civicrm/civicrm_handler_field_relationship_type.inc

@@ -31,8 +31,7 @@
  *
  */
 class civicrm_handler_field_relationship_type extends views_handler_field {
-
-  static $_relationshipType;
+  public static $_relationshipType;
 
   public function construct() {
     parent::construct();

modules/views/civicrm/civicrm_handler_field_state.inc

@@ -29,9 +29,8 @@
  * @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();

modules/views/civicrm/civicrm_handler_field_website.inc

@@ -29,8 +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();

modules/views/civicrm/civicrm_handler_filter_encounter_medium.inc

@@ -33,8 +33,7 @@
  *
  */
 class civicrm_handler_filter_encounter_medium extends views_handler_filter_in_operator {
-
-  static $_encounter_medium;
+  public static $_encounter_medium;
 
   public function construct() {
     parent::construct();