CRM-17281: Fix pledge miscalculation when total amount covers multiple installments

.gitignore

@@ -2,116 +2,10 @@
 *.bak
 backdrop/
 bower_components
-CRM/ACL/DAO
-CRM/Activity/DAO
-CRM/Auction/DAO
-CRM/Campaign/DAO
-CRM/Case/DAO
 CRM/Case/xml/configuration
-CRM/Contact/DAO/ACLContactCache.php
-CRM/Contact/DAO/Contact.php
-CRM/Contact/DAO/ContactType.php
-CRM/Contact/DAO/DashboardContact.php
-CRM/Contact/DAO/Group.php
-CRM/Contact/DAO/GroupContact.php
-CRM/Contact/DAO/GroupContactCache.php
-CRM/Contact/DAO/GroupNesting.php
-CRM/Contact/DAO/GroupOrganization.php
-CRM/Contact/DAO/Relationship.php
-CRM/Contact/DAO/RelationshipType.php
-CRM/Contact/DAO/SavedSearch.php
-CRM/Contact/DAO/SubscriptionHistory.php
-CRM/Contribute/DAO
-CRM/Core/DAO/AllCoreTables.php
 CRM/Core/DAO/.listAll.php
 CRM/Core/DAO/listAll.php
-CRM/Core/DAO/ActionLog.php
-CRM/Core/DAO/ActionMapping.php
-CRM/Core/DAO/ActionSchedule.php
-CRM/Core/DAO/Address.php
-CRM/Core/DAO/AddressFormat.php
-CRM/Core/DAO/Batch.php
-CRM/Core/DAO/Cache.php
-CRM/Core/DAO/Component.php
-CRM/Core/DAO/Country.php
-CRM/Core/DAO/County.php
-CRM/Core/DAO/Currency.php
-CRM/Core/DAO/CustomField.php
-CRM/Core/DAO/CustomGroup.php
-CRM/Core/DAO/Dashboard.php
-CRM/Core/DAO/Discount.php
-CRM/Core/DAO/Domain.php
-CRM/Core/DAO/Email.php
-CRM/Core/DAO/EntityBatch.php
-CRM/Core/DAO/EntityFile.php
-CRM/Core/DAO/EntityFinancialTrxn.php
-CRM/Core/DAO/EntityTag.php
-CRM/Core/DAO/Extension.php
-CRM/Core/DAO/File.php
-CRM/Core/DAO/FinancialAccount.php
-CRM/Core/DAO/FinancialTrxn.php
-CRM/Core/DAO/IM.php
-CRM/Core/DAO/Job.php
-CRM/Core/DAO/JobLog.php
-CRM/Core/DAO/LineItem.php
-CRM/Core/DAO/LocBlock.php
-CRM/Core/DAO/LocationType.php
-CRM/Core/DAO/Log.php
-CRM/Core/DAO/MailSettings.php
-CRM/Core/DAO/Managed.php
-CRM/Core/DAO/Mapping.php
-CRM/Core/DAO/MappingField.php
-CRM/Core/DAO/Menu.php
-CRM/Core/DAO/MessageTemplate.php
-CRM/Core/DAO/MessageTemplates.php
-CRM/Core/DAO/Navigation.php
-CRM/Core/DAO/Note.php
-CRM/Core/DAO/OpenID.php
-CRM/Core/DAO/OptionGroup.php
-CRM/Core/DAO/OptionValue.php
-CRM/Core/DAO/PaymentProcessor.php
-CRM/Core/DAO/PaymentProcessorType.php
-CRM/Core/DAO/Persistent.php
-CRM/Core/DAO/Phone.php
-CRM/Core/DAO/Preferences.php
-CRM/Core/DAO/PreferencesDate.php
-CRM/Core/DAO/PrevNextCache.php
-CRM/Core/DAO/PriceField.php
-CRM/Core/DAO/PriceSet.php
-CRM/Core/DAO/PriceSetEntity.php
-CRM/Core/DAO/PrintLabel.php
-CRM/Core/DAO/RecurringEntity.php
-CRM/Core/DAO/Setting.php
-CRM/Core/DAO/StateProvince.php
-CRM/Core/DAO/StatusPreference.php
-CRM/Core/DAO/SystemLog.php
-CRM/Core/DAO/Tag.php
-CRM/Core/DAO/Timezone.php
-CRM/Core/DAO/UFField.php
-CRM/Core/DAO/UFGroup.php
-CRM/Core/DAO/UFJoin.php
-CRM/Core/DAO/UFMatch.php
-CRM/Core/DAO/Website.php
-CRM/Core/DAO/WordReplacement.php
-CRM/Core/DAO/Worldregion.php
 CRM/Core/I18n/SchemaStructure.php
-CRM/Cxn/DAO
-CRM/Dedupe/DAO
-CRM/Event/Cart/DAO
-CRM/Event/DAO
-CRM/Friend/DAO
-CRM/Grant/DAO
-CRM/Mailing/DAO
-CRM/Mailing/Event/DAO
-CRM/Member/DAO
-CRM/PCP/DAO
-CRM/Pledge/DAO
-CRM/Price/DAO
-CRM/Project/DAO
-CRM/Queue/DAO
-CRM/Report/DAO
-CRM/SMS/DAO
-CRM/Standalone/OpenID/DAO
 bin/setup.conf
 civicrm-version.php
 civicrm-version.txt
@@ -143,8 +37,6 @@ tests/phpunit/CiviTest/CiviSeleniumSettings.php
 tests/phpunit/CiviTest/civicrm.settings.php
 tools/stats/config.php
 authors.txt
-CRM/Batch/DAO/
-CRM/Financial/DAO/
 drupal/
 WordPress
 joomla

CRM/ACL/API.php

@@ -57,8 +57,7 @@ class CRM_ACL_API {
    */
   public static function check($str, $contactID = NULL) {
     if ($contactID == NULL) {
-      $session = CRM_Core_Session::singleton();
-      $contactID = $session->get('userID');
+      $contactID = CRM_Core_Session::getLoggedInContactID();
     }
 
     if (!$contactID) {
@@ -85,6 +84,10 @@ public static function check($str, $contactID = NULL) {
    * @param bool $skipDeleteClause
    *   Don't add delete clause if this is true,.
    *   this means it is handled by generating query
+   * @param bool $skipOwnContactClause
+   *   Do not add 'OR contact_id = $userID' to the where clause.
+   *   This is a hideously inefficient query and should be avoided
+   *   wherever possible.
    *
    * @return string
    *   the group where clause for this user
@@ -95,7 +98,8 @@ public static function whereClause(
     &$whereTables,
     $contactID = NULL,
     $onlyDeleted = FALSE,
-    $skipDeleteClause = FALSE
+    $skipDeleteClause = FALSE,
+    $skipOwnContactClause = FALSE
   ) {
     // the default value which is valid for the final AND
     $deleteClause = ' ( 1 ) ';
@@ -132,9 +136,9 @@ public static function whereClause(
       )
     );
 
-    // Add permission on self
-    if ($contactID && (CRM_Core_Permission::check('edit my contact') ||
-      $type == self::VIEW && CRM_Core_Permission::check('view my contact'))
+    // Add permission on self if we really hate our server or have hardly any contacts.
+    if (!$skipOwnContactClause && $contactID && (CRM_Core_Permission::check('edit my contact') ||
+        $type == self::VIEW && CRM_Core_Permission::check('view my contact'))
     ) {
       $where = "(contact_a.id = $contactID OR ($where))";
     }
@@ -164,8 +168,7 @@ public static function group(
     $includedGroups = NULL
   ) {
     if ($contactID == NULL) {
-      $session = CRM_Core_Session::singleton();
-      $contactID = $session->get('userID');
+      $contactID = CRM_Core_Session::getLoggedInContactID();
     }
 
     if (!$contactID) {

CRM/ACL/BAO/ACL.php

@@ -126,8 +126,7 @@ public static function permissionClause(
       'GroupContact' => CRM_Contact_DAO_GroupContact::getTableName(),
     );
 
-    $session = CRM_Core_Session::singleton();
-    $contact_id = $session->get('userID');
+    $contact_id = CRM_Core_Session::getLoggedInContactID();
 
     $where = " {$t['ACL']}.operation = '" . CRM_Utils_Type::escape($operation, 'String') . "'";
 
@@ -722,55 +721,15 @@ public static function check($str, $contactID) {
     return ($count) ? TRUE : FALSE;
   }
 
-  /**
-   * Build a join and where part for a query
-   *
-   * @param int $contactId
-   * @return array - the first key is join part of the query and the second key is the where part of the query
-   */
-  public static function buildAcl($contactId) {
-    // If there is no $contactId passed return empty ACL join and where clause
-    if (empty($contactId)) {
-      return array('', '');
-    }
-
-    $tables = array();
-    $whereTables = array();
-    $whereClause = CRM_ACL_BAO_ACL::whereClause(CRM_Core_Permission::VIEW, $tables, $whereTables, $contactId, TRUE);
-    if (strlen($whereClause)) {
-      $whereClause = " AND (" . $whereClause . ")";
-    }
-
-    $join = "";
-    foreach ($whereTables as $name => $value) {
-      if (!$value) {
-        continue;
-      }
-      if ($value != 1) {
-        // if there is already a join statement in value, use value itself
-        if (strpos($value, 'JOIN')) {
-          $join .= " $value ";
-        }
-        continue;
-      }
-    }
-
-    return array(
-      $join,
-      $whereClause,
-    );
-  }
-
   /**
    * @param $type
    * @param $tables
    * @param $whereTables
    * @param int $contactID
-   * @param bool $strictReturn If there is no where clause build for ACL
    *
    * @return null|string
    */
-  public static function whereClause($type, &$tables, &$whereTables, $contactID = NULL, $strictReturn = FALSE) {
+  public static function whereClause($type, &$tables, &$whereTables, $contactID = NULL) {
     $acls = CRM_ACL_BAO_Cache::build($contactID);
 
     $whereClause = NULL;
@@ -880,7 +839,7 @@ public static function whereClause($type, &$tables, &$whereTables, $contactID =
     // call the hook to get additional whereClauses
     CRM_Utils_Hook::aclWhereClause($type, $tables, $whereTables, $contactID, $whereClause);
 
-    if (empty($whereClause) && !$strictReturn) {
+    if (empty($whereClause)) {
       $whereClause = ' ( 0 ) ';
     }
 
@@ -903,6 +862,13 @@ public static function group(
     $allGroups = NULL,
     $includedGroups = NULL
   ) {
+    $userCacheKey = "{$contactID}_{$type}_{$tableName}_" . CRM_Core_Config::domainID() . '_' . md5(implode(',', array_merge((array) $allGroups, (array) $includedGroups)));
+    if (empty(Civi::$statics[__CLASS__]['permissioned_groups'])) {
+      Civi::$statics[__CLASS__]['permissioned_groups'] = array();
+    }
+    if (!empty(Civi::$statics[__CLASS__]['permissioned_groups'][$userCacheKey])) {
+      return Civi::$statics[__CLASS__]['permissioned_groups'][$userCacheKey];
+    }
 
     $acls = CRM_ACL_BAO_Cache::build($contactID);
 
@@ -953,9 +919,25 @@ public static function group(
     ) {
       $ids = $includedGroups;
     }
+    if ($contactID) {
+      $groupWhere = '';
+      if (!empty($allGroups)) {
+        $groupWhere = " AND id IN (" . implode(',', array_keys($allGroups)) . ")";
+      }
+      // Contacts create hidden groups from search results. They should be able to retrieve their own.
+      $ownHiddenGroupsList = CRM_Core_DAO::singleValueQuery("
+        SELECT GROUP_CONCAT(id) FROM civicrm_group WHERE is_hidden =1 AND created_id = $contactID
+        $groupWhere
+      ");
+      if ($ownHiddenGroupsList) {
+        $ownHiddenGroups = explode(',', $ownHiddenGroupsList);
+        $ids = array_merge((array) $ids, $ownHiddenGroups);
+      }
+
+    }
 
     CRM_Utils_Hook::aclGroup($type, $contactID, $tableName, $allGroups, $ids);
-
+    Civi::$statics[__CLASS__]['permissioned_groups'][$userCacheKey] = $ids;
     return $ids;
   }