From: Dmitry Smirnov Date: Sat, 2 May 2015 05:48:32 +0000 (+1000) Subject: codespell: CRM/* X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=b44e3f8468ceba3e1b321d31dd2e35a1aa1a5d9a;p=civicrm-core.git codespell: CRM/* --- diff --git a/CRM/ACL/BAO/ACL.php b/CRM/ACL/BAO/ACL.php index c44c7fedbe..c15e9c738e 100644 --- a/CRM/ACL/BAO/ACL.php +++ b/CRM/ACL/BAO/ACL.php @@ -679,7 +679,7 @@ SELECT $acl.* * Value we want to set the is_active field. * * @return Object - * DAO object on sucess, null otherwise + * DAO object on success, null otherwise */ public static function setIsActive($id, $is_active) { // note this also resets any ACL cache diff --git a/CRM/ACL/BAO/EntityRole.php b/CRM/ACL/BAO/EntityRole.php index b5341b8e98..59fadaecdd 100644 --- a/CRM/ACL/BAO/EntityRole.php +++ b/CRM/ACL/BAO/EntityRole.php @@ -81,7 +81,7 @@ class CRM_ACL_BAO_EntityRole extends CRM_ACL_DAO_EntityRole { * Value we want to set the is_active field. * * @return Object - * DAO object on sucess, null otherwise + * DAO object on success, null otherwise */ public static function setIsActive($id, $is_active) { return CRM_Core_DAO::setFieldValue('CRM_ACL_DAO_EntityRole', $id, 'is_active', $is_active); diff --git a/CRM/Activity/Form/Activity.php b/CRM/Activity/Form/Activity.php index cc825b6a9c..a3e76f4375 100644 --- a/CRM/Activity/Form/Activity.php +++ b/CRM/Activity/Form/Activity.php @@ -580,7 +580,7 @@ class CRM_Activity_Form_Activity extends CRM_Contact_Form_Task { $defaults['target_contact_id'] = $this->_contactIds; } - // CRM-15472 - 50 is around the practial limit of how many items a select2 entityRef can handle + // CRM-15472 - 50 is around the practical limit of how many items a select2 entityRef can handle if (!empty($defaults['target_contact_id'])) { $count = count(is_array($defaults['target_contact_id']) ? $defaults['target_contact_id'] : explode(',', $defaults['target_contact_id'])); if ($count > 50) { diff --git a/CRM/Activity/Import/Form/Preview.php b/CRM/Activity/Import/Form/Preview.php index e77dc537a7..04110c9a41 100644 --- a/CRM/Activity/Import/Form/Preview.php +++ b/CRM/Activity/Import/Form/Preview.php @@ -165,7 +165,7 @@ class CRM_Activity_Import_Form_Preview extends CRM_Import_Form_Preview { // add all the necessary variables to the form $parser->set($this, CRM_Import_Parser::MODE_IMPORT); - // check if there is any error occured + // check if there is any error occurred $errorStack = CRM_Core_Error::singleton(); $errors = $errorStack->getErrors(); diff --git a/CRM/Activity/Page/AJAX.php b/CRM/Activity/Page/AJAX.php index 9c79eae36c..cb7e039d9f 100644 --- a/CRM/Activity/Page/AJAX.php +++ b/CRM/Activity/Page/AJAX.php @@ -228,7 +228,7 @@ class CRM_Activity_Page_AJAX { $caseRelationships[$key]['relation'] = $caseRoles[$value['relation_type']]; unset($caseRoles[$value['relation_type']]); } - // mark orginal case relationships record to use on setting edit links below + // mark original case relationships record to use on setting edit links below $caseRelationships[$key]['source'] = 'caseRel'; } diff --git a/CRM/Admin/Page/Extensions.php b/CRM/Admin/Page/Extensions.php index 07fb3e194f..6f3a1224c2 100644 --- a/CRM/Admin/Page/Extensions.php +++ b/CRM/Admin/Page/Extensions.php @@ -212,7 +212,7 @@ class CRM_Admin_Page_Extensions extends CRM_Core_Page_Basic { } $this->assign('localExtensionRows', $localExtensionRows); - // build list of availabe downloads + // build list of available downloads $remoteExtensionRows = array(); foreach (CRM_Extension_System::singleton()->getBrowser()->getExtensions() as $info) { $row = (array) $info; diff --git a/CRM/Badge/BAO/Badge.php b/CRM/Badge/BAO/Badge.php index 90953f9567..cab4afddb6 100644 --- a/CRM/Badge/BAO/Badge.php +++ b/CRM/Badge/BAO/Badge.php @@ -75,7 +75,7 @@ class CRM_Badge_BAO_Badge { } /** - * Funtion to create structure and add meta data according to layout. + * Function to create structure and add meta data according to layout. * * @param array $row * Row element that needs to be formatted. diff --git a/CRM/Campaign/BAO/Campaign.php b/CRM/Campaign/BAO/Campaign.php index ee96a5acab..c11c7d1f3d 100644 --- a/CRM/Campaign/BAO/Campaign.php +++ b/CRM/Campaign/BAO/Campaign.php @@ -554,7 +554,7 @@ INNER JOIN civicrm_group grp ON ( grp.id = campgrp.entity_id ) * Value we want to set the is_active field. * * @return CRM_Campaign_DAO_Campaign|null - * DAO object on sucess, null otherwise + * DAO object on success, null otherwise */ public static function setIsActive($id, $is_active) { return CRM_Core_DAO::setFieldValue('CRM_Campaign_DAO_Campaign', $id, 'is_active', $is_active); diff --git a/CRM/Campaign/BAO/Survey.php b/CRM/Campaign/BAO/Survey.php index 7c7d500423..45ecdd462b 100644 --- a/CRM/Campaign/BAO/Survey.php +++ b/CRM/Campaign/BAO/Survey.php @@ -377,7 +377,7 @@ SELECT survey.id as id, * Value we want to set the is_active field. * * @return Object - * DAO object on sucess, null otherwise + * DAO object on success, null otherwise */ public static function setIsActive($id, $is_active) { return CRM_Core_DAO::setFieldValue('CRM_Campaign_DAO_Survey', $id, 'is_active', $is_active); diff --git a/CRM/Campaign/Form/Task/Release.php b/CRM/Campaign/Form/Task/Release.php index b0a3b2d511..ec668bdb16 100644 --- a/CRM/Campaign/Form/Task/Release.php +++ b/CRM/Campaign/Form/Task/Release.php @@ -154,7 +154,7 @@ class CRM_Campaign_Form_Task_Release extends CRM_Campaign_Form_Task { } } - //set survey activites as deleted = true. + //set survey activities as deleted = true. if (!empty($deleteActivityIds)) { $query = 'UPDATE civicrm_activity SET is_deleted = 1 WHERE id IN ( ' . implode(', ', $deleteActivityIds) . ' )'; CRM_Core_DAO::executeQuery($query); diff --git a/CRM/Case/BAO/CaseType.php b/CRM/Case/BAO/CaseType.php index 00fa4f2fd5..26fade6a73 100644 --- a/CRM/Case/BAO/CaseType.php +++ b/CRM/Case/BAO/CaseType.php @@ -109,7 +109,7 @@ class CRM_Case_BAO_CaseType extends CRM_Case_DAO_CaseType { * * @param string $name * @param array $definition - * The case-type defintion expressed as an array-tree. + * The case-type definition expressed as an array-tree. * @return string * XML */ diff --git a/CRM/Case/Form/Case.php b/CRM/Case/Form/Case.php index 6c75b896c0..56721b0c40 100644 --- a/CRM/Case/Form/Case.php +++ b/CRM/Case/Form/Case.php @@ -434,7 +434,7 @@ class CRM_Case_Form_Case extends CRM_Core_Form { $className::endPostProcess($this, $params); } - // 5. auto populate activites + // 5. auto populate activities // 6. set status CRM_Core_Session::setStatus($params['statusMsg'], ts('Saved'), 'success'); diff --git a/CRM/Case/XMLProcessor/Report.php b/CRM/Case/XMLProcessor/Report.php index 8d13730cf3..50235b7a54 100644 --- a/CRM/Case/XMLProcessor/Report.php +++ b/CRM/Case/XMLProcessor/Report.php @@ -794,7 +794,7 @@ LIMIT 1 return FALSE; } - // next get activity set Informtion + // next get activity set Information $activitySet = array( 'label' => $form->getActivitySetLabel($xml, $activitySetName), 'includeActivities' => 'All', diff --git a/CRM/Contact/BAO/Contact.php b/CRM/Contact/BAO/Contact.php index 70c2dae2c2..0a87121abe 100644 --- a/CRM/Contact/BAO/Contact.php +++ b/CRM/Contact/BAO/Contact.php @@ -327,7 +327,7 @@ class CRM_Contact_BAO_Contact extends CRM_Contact_DAO_Contact { $contact = self::add($params); if (!$contact) { - // Not dying here is stupid, since we get into wierd situation and into a bug that + // Not dying here is stupid, since we get into weird situation and into a bug that // is impossible to figure out for the user or for us // CRM-7925 CRM_Core_Error::fatal(); diff --git a/CRM/Contact/BAO/Group.php b/CRM/Contact/BAO/Group.php index 9f2d05a4a7..753a0d44f8 100644 --- a/CRM/Contact/BAO/Group.php +++ b/CRM/Contact/BAO/Group.php @@ -632,7 +632,7 @@ class CRM_Contact_BAO_Group extends CRM_Contact_DAO_Group { /** * This function create the hidden smart group when user perform - * contact seach and want to send mailing to search contacts. + * contact search and want to send mailing to search contacts. * * @param array $params * ( reference ) an assoc array of name/value pairs. @@ -1003,10 +1003,10 @@ class CRM_Contact_BAO_Group extends CRM_Contact_DAO_Group { // need to return id, title (w/ spacer), description, visibility // We need to build a list of tags ordered by hierarchy and sorted by - // name. The heirarchy will be communicated by an accumulation of + // name. The hierarchy will be communicated by an accumulation of // separators in front of the name to give it a visual offset. // Instead of recursively making mysql queries, we'll make one big - // query and build the heirarchy with the algorithm below. + // query and build the hierarchy with the algorithm below. $groups = array(); $args = array(1 => array($groupIdString, 'String')); $query = " diff --git a/CRM/Contact/BAO/GroupContactCache.php b/CRM/Contact/BAO/GroupContactCache.php index 6f49d40169..cee83d5432 100644 --- a/CRM/Contact/BAO/GroupContactCache.php +++ b/CRM/Contact/BAO/GroupContactCache.php @@ -137,7 +137,7 @@ AND ( g.cache_date IS NULL OR $groupIDs = array($groupIDs); } - // note escapeString is a must here and we can't send the imploded value as second arguement to + // note escapeString is a must here and we can't send the imploded value as second argument to // the executeQuery(), since that would put single quote around the string and such a string // of comma separated integers would not work. $groupIDString = CRM_Core_DAO::escapeString(implode(', ', $groupIDs)); @@ -446,7 +446,7 @@ WHERE id = %1 self::$_alreadyLoaded[$groupID] = 1; - // we now have the lock, but some other proces could have actually done the work + // we now have the lock, but some other process could have actually done the work // before we got here, so before we do any work, lets ensure that work needs to be // done // we allow hidden groups here since we dont know if the caller wants to evaluate an diff --git a/CRM/Contact/BAO/GroupNesting.php b/CRM/Contact/BAO/GroupNesting.php index 03522d43af..a0ddbccebf 100644 --- a/CRM/Contact/BAO/GroupNesting.php +++ b/CRM/Contact/BAO/GroupNesting.php @@ -162,7 +162,7 @@ class CRM_Contact_BAO_GroupNesting extends CRM_Contact_DAO_GroupNesting implemen if (!$nextGroup) { // no sibling, find an ancestor w/ a sibling for (;;) { - // since we pop this array everytime, we should be + // since we pop this array every time, we should be // reasonably safe from infinite loops, I think :) $ancestor = array_pop($this->_parentStack); $this->_current = &$ancestor; diff --git a/CRM/Contact/BAO/GroupNestingCache.php b/CRM/Contact/BAO/GroupNestingCache.php index 4d30788f31..dfaa529f10 100644 --- a/CRM/Contact/BAO/GroupNestingCache.php +++ b/CRM/Contact/BAO/GroupNestingCache.php @@ -69,7 +69,7 @@ WHERE n.child_group_id = gc.id } if (self::checkCyclicGraph($tree)) { - CRM_Core_Error::fatal(ts('We detected a cycle which we cant handle. aborting')); + CRM_Core_Error::fatal(ts('We detected a cycle which we can't handle. aborting')); } // first reset the current cache entries @@ -105,7 +105,7 @@ WHERE id = $id * @return bool */ public static function checkCyclicGraph(&$tree) { - // lets keep this simple, we should probably use a graph algoritm here at some stage + // lets keep this simple, we should probably use a graph algorithm here at some stage // foreach group that has a parent or a child, ensure that // the ancestors and descendants dont intersect diff --git a/CRM/Contact/BAO/RelationshipType.php b/CRM/Contact/BAO/RelationshipType.php index 131e47e3e7..78f4cd2ddb 100644 --- a/CRM/Contact/BAO/RelationshipType.php +++ b/CRM/Contact/BAO/RelationshipType.php @@ -71,7 +71,7 @@ class CRM_Contact_BAO_RelationshipType extends CRM_Contact_DAO_RelationshipType * Value we want to set the is_active field. * * @return Object - * DAO object on sucess, null otherwise + * DAO object on success, null otherwise */ public static function setIsActive($id, $is_active) { return CRM_Core_DAO::setFieldValue('CRM_Contact_DAO_RelationshipType', $id, 'is_active', $is_active); diff --git a/CRM/Contact/Controller/Search.php b/CRM/Contact/Controller/Search.php index 42f43bedd8..3abbd15c27 100644 --- a/CRM/Contact/Controller/Search.php +++ b/CRM/Contact/Controller/Search.php @@ -77,7 +77,7 @@ class CRM_Contact_Controller_Search extends CRM_Core_Controller { CRM_Core_Session::setStatus($message); // see if we can figure out the url and redirect to the right search form - // note that this happens really early on, so we cant use any of the form or controller + // note that this happens really early on, so we can't use any of the form or controller // variables $config = CRM_Core_Config::singleton(); $qString = $_GET[$config->userFrameworkURLVar]; diff --git a/CRM/Contact/Form/Contact.php b/CRM/Contact/Form/Contact.php index b4105510dd..877ab7e551 100644 --- a/CRM/Contact/Form/Contact.php +++ b/CRM/Contact/Form/Contact.php @@ -1235,7 +1235,7 @@ class CRM_Contact_Form_Contact extends CRM_Core_Form { * of key value consist of address blocks. * * @return array - * as array of sucess/fails for each address block + * as array of success/fails for each address block */ public function parseAddress(&$params) { $parseSuccess = $parsedFields = array(); diff --git a/CRM/Contact/Form/Domain.php b/CRM/Contact/Form/Domain.php index 0ec0030303..86786dfc8b 100644 --- a/CRM/Contact/Form/Domain.php +++ b/CRM/Contact/Form/Domain.php @@ -209,7 +209,7 @@ class CRM_Contact_Form_Domain extends CRM_Core_Form { // check for state/country mapping $errors = CRM_Contact_Form_Edit_Address::formRule($fields, CRM_Core_DAO::$_nullArray, CRM_Core_DAO::$_nullObject); // $errors === TRUE means no errors from above formRule excution, - // so declaring $errors to array for futher processing + // so declaring $errors to array for further processing if ($errors === TRUE) { $errors = array(); } diff --git a/CRM/Contact/Form/Edit/CommunicationPreferences.php b/CRM/Contact/Form/Edit/CommunicationPreferences.php index 34a17facdc..beb88b74f8 100644 --- a/CRM/Contact/Form/Edit/CommunicationPreferences.php +++ b/CRM/Contact/Form/Edit/CommunicationPreferences.php @@ -53,7 +53,7 @@ class CRM_Contact_Form_Edit_CommunicationPreferences { * @return void */ public static function buildQuickForm(&$form) { - // since the pcm - preferred comminication method is logically + // since the pcm - preferred communication method is logically // grouped hence we'll use groups of HTML_QuickForm // checkboxes for DO NOT phone, email, mail diff --git a/CRM/Contact/Form/Edit/Household.php b/CRM/Contact/Form/Edit/Household.php index b5852f3acc..417a826104 100644 --- a/CRM/Contact/Form/Edit/Household.php +++ b/CRM/Contact/Form/Edit/Household.php @@ -34,7 +34,7 @@ */ /** - * Auxilary class to provide support to the Contact Form class. Does this by implementing + * Auxiliary class to provide support to the Contact Form class. Does this by implementing * a small set of static methods * */ diff --git a/CRM/Contact/Form/Edit/Individual.php b/CRM/Contact/Form/Edit/Individual.php index 4655e5fdde..81ccaaa8ff 100644 --- a/CRM/Contact/Form/Edit/Individual.php +++ b/CRM/Contact/Form/Edit/Individual.php @@ -34,7 +34,7 @@ */ /** - * Auxilary class to provide support to the Contact Form class. Does this by implementing + * Auxiliary class to provide support to the Contact Form class. Does this by implementing * a small set of static methods * */ diff --git a/CRM/Contact/Form/Edit/Lock.php b/CRM/Contact/Form/Edit/Lock.php index f7086eb8aa..0b9e183ba9 100644 --- a/CRM/Contact/Form/Edit/Lock.php +++ b/CRM/Contact/Form/Edit/Lock.php @@ -34,7 +34,7 @@ */ /** - * Auxilary class to provide support for locking (and ignoring locks on) + * Auxiliary class to provide support for locking (and ignoring locks on) * contact records. */ class CRM_Contact_Form_Edit_Lock { diff --git a/CRM/Contact/Form/Edit/Organization.php b/CRM/Contact/Form/Edit/Organization.php index f1c2583953..da41d8f5db 100644 --- a/CRM/Contact/Form/Edit/Organization.php +++ b/CRM/Contact/Form/Edit/Organization.php @@ -34,7 +34,7 @@ */ /** - * Auxilary class to provide support to the Contact Form class. Does this by implementing + * Auxiliary class to provide support to the Contact Form class. Does this by implementing * a small set of static methods * */ diff --git a/CRM/Contact/Form/Inline/Lock.php b/CRM/Contact/Form/Inline/Lock.php index e48b3fc46d..839e71c67a 100644 --- a/CRM/Contact/Form/Inline/Lock.php +++ b/CRM/Contact/Form/Inline/Lock.php @@ -34,7 +34,7 @@ */ /** - * Auxilary class to provide support for locking (and ignoring locks on) + * Auxiliary class to provide support for locking (and ignoring locks on) * contact records. */ class CRM_Contact_Form_Inline_Lock { diff --git a/CRM/Contact/Form/Task.php b/CRM/Contact/Form/Task.php index 172f58a793..65ca288868 100644 --- a/CRM/Contact/Form/Task.php +++ b/CRM/Contact/Form/Task.php @@ -201,7 +201,7 @@ class CRM_Contact_Form_Task extends CRM_Core_Form { // need to perform action on only selected contacts $insertString = array(); - // refire sql in case of custom seach + // refire sql in case of custom search if ($form->_action == CRM_Core_Action::COPY) { // selected contacts only // need to perform action on only selected contacts diff --git a/CRM/Contact/Import/Form/MapField.php b/CRM/Contact/Import/Form/MapField.php index 518c1dd930..b5306cd381 100644 --- a/CRM/Contact/Import/Form/MapField.php +++ b/CRM/Contact/Import/Form/MapField.php @@ -855,7 +855,7 @@ class CRM_Contact_Import_Form_MapField extends CRM_Import_Form_MapField { $updateMappingFields->name = $mapper[$i]; $updateMappingFields->relationship_type_id = 'NULL'; $updateMappingFields->relationship_type_direction = 'NULL'; - // to store phoneType id and provider id seperately + // to store phoneType id and provider id separately // before updating mappingFields for phone and IM, CRM-3140 if (CRM_Utils_Array::value('0', $mapperKeys[$i]) == 'url') { $updateMappingFields->website_type_id = isset($mapperKeys[$i][1]) ? $mapperKeys[$i][1] : NULL; @@ -917,7 +917,7 @@ class CRM_Contact_Import_Form_MapField extends CRM_Import_Form_MapField { $saveMappingFields->name = ucwords(str_replace("_", " ", $mapperKeys[$i][1])); $saveMappingFields->relationship_type_id = $id; $saveMappingFields->relationship_direction = "{$first}_{$second}"; - // to get phoneType id and provider id seperately + // to get phoneType id and provider id separately // before saving mappingFields of phone and IM for related contact, CRM-3140 if (CRM_Utils_Array::value('1', $mapperKeys[$i]) == 'url') { $saveMappingFields->website_type_id = isset($mapperKeys[$i][2]) ? $mapperKeys[$i][2] : NULL; @@ -935,7 +935,7 @@ class CRM_Contact_Import_Form_MapField extends CRM_Import_Form_MapField { else { $saveMappingFields->name = $mapper[$i]; $location_id = array_keys($locationTypes, $locations[$i]); - // to get phoneType id and provider id seperately + // to get phoneType id and provider id separately // before saving mappingFields of phone and IM, CRM-3140 if (CRM_Utils_Array::value('0', $mapperKeys[$i]) == 'url') { $saveMappingFields->website_type_id = isset($mapperKeys[$i][1]) ? $mapperKeys[$i][1] : NULL; diff --git a/CRM/Contact/Import/Form/Preview.php b/CRM/Contact/Import/Form/Preview.php index fd8ba0bba0..23c60573dc 100644 --- a/CRM/Contact/Import/Form/Preview.php +++ b/CRM/Contact/Import/Form/Preview.php @@ -306,7 +306,7 @@ class CRM_Contact_Import_Form_Preview extends CRM_Import_Form_Preview { // add all the necessary variables to the form $importJob->setFormVariables($this); - // check if there is any error occured + // check if there is any error occurred $errorStack = CRM_Core_Error::singleton(); $errors = $errorStack->getErrors(); $errorMessage = array(); @@ -571,7 +571,7 @@ class CRM_Contact_Import_Form_Preview extends CRM_Import_Form_Preview { // add all the necessary variables to the form $parser->set($this, CRM_Import_Parser::MODE_IMPORT); - // check if there is any error occured + // check if there is any error occurred $errorStack = CRM_Core_Error::singleton(); $errors = $errorStack->getErrors(); diff --git a/CRM/Contact/Page/AJAX.php b/CRM/Contact/Page/AJAX.php index 35f485a60a..1bb86f113e 100644 --- a/CRM/Contact/Page/AJAX.php +++ b/CRM/Contact/Page/AJAX.php @@ -335,7 +335,7 @@ class CRM_Contact_Page_AJAX { $config->userSystem->checkUserNameEmailExists($params, $errors); if (isset($errors['cms_name']) || isset($errors['name'])) { - //user name is not availble + //user name is not available $user = array('name' => 'no'); CRM_Utils_JSON::output($user); } @@ -383,7 +383,7 @@ class CRM_Contact_Page_AJAX { else { $cid = CRM_Utils_Array::value('cid', $_GET); if ($cid) { - //check cid for interger + //check cid for integer $contIDS = explode(',', $cid); foreach ($contIDS as $contID) { CRM_Utils_Type::escape($contID, 'Integer'); @@ -478,7 +478,7 @@ LIMIT {$offset}, {$rowCount} else { $cid = CRM_Utils_Array::value('cid', $_GET); if ($cid) { - //check cid for interger + //check cid for integer $contIDS = explode(',', $cid); foreach ($contIDS as $contID) { CRM_Utils_Type::escape($contID, 'Integer'); diff --git a/CRM/Contribute/BAO/Contribution.php b/CRM/Contribute/BAO/Contribution.php index 127b17871f..3bfae9d9bf 100644 --- a/CRM/Contribute/BAO/Contribution.php +++ b/CRM/Contribute/BAO/Contribution.php @@ -2922,7 +2922,7 @@ WHERE contribution_id = %1 "; $params['entity_id'] = $financialTxn->id; } } - // record line items and finacial items + // record line items and financial items if (empty($params['skipLineItem'])) { CRM_Price_BAO_LineItem::processPriceSet($entityId, CRM_Utils_Array::value('line_item', $params), $params['contribution'], $entityTable, $update); } diff --git a/CRM/Contribute/BAO/ManagePremiums.php b/CRM/Contribute/BAO/ManagePremiums.php index f1c7c12ae3..cac1213f61 100644 --- a/CRM/Contribute/BAO/ManagePremiums.php +++ b/CRM/Contribute/BAO/ManagePremiums.php @@ -76,7 +76,7 @@ class CRM_Contribute_BAO_ManagePremiums extends CRM_Contribute_DAO_Product { * Value we want to set the is_active field. * * @return Object - * DAO object on sucess, null otherwise + * DAO object on success, null otherwise */ public static function setIsActive($id, $is_active) { if (!$is_active) { diff --git a/CRM/Contribute/BAO/Premium.php b/CRM/Contribute/BAO/Premium.php index 9e7efd5fc4..615d55e21f 100644 --- a/CRM/Contribute/BAO/Premium.php +++ b/CRM/Contribute/BAO/Premium.php @@ -76,7 +76,7 @@ class CRM_Contribute_BAO_Premium extends CRM_Contribute_DAO_Premium { * Value we want to set the is_active field. * * @return Object - * DAO object on sucess, null otherwise + * DAO object on success, null otherwise */ public static function setIsActive($id, $is_active) { return CRM_Core_DAO::setFieldValue('CRM_Contribute_DAO_Premium', $id, 'premiums_active ', $is_active); diff --git a/CRM/Contribute/Form/Contribution/Main.php b/CRM/Contribute/Form/Contribution/Main.php index 9c103e6c96..708d9bdc0f 100644 --- a/CRM/Contribute/Form/Contribution/Main.php +++ b/CRM/Contribute/Form/Contribution/Main.php @@ -74,7 +74,7 @@ class CRM_Contribute_Form_Contribution_Main extends CRM_Contribute_Form_Contribu self::preProcessPaymentOptions($this); - // Make the contributionPageID avilable to the template + // Make the contributionPageID available to the template $this->assign('contributionPageID', $this->_id); $this->assign('isShare', CRM_Utils_Array::value('is_share', $this->_values)); $this->assign('isConfirmEnabled', CRM_Utils_Array::value('is_confirm_enabled', $this->_values)); @@ -940,8 +940,8 @@ class CRM_Contribute_Form_Contribution_Main extends CRM_Contribute_Form_Contribu $priceFieldIDS['id'] = $fields['priceSetId']; $self->set('memberPriceFieldIDS', $priceFieldIDS); $count = CRM_Price_BAO_PriceSet::getMembershipCount($ids); - foreach ($count as $id => $occurance) { - if ($occurance > 1) { + foreach ($count as $id => $occurrence) { + if ($occurrence > 1) { $errors['_qf_default'] = ts('You have selected multiple memberships for the same organization or entity. Please review your selections and choose only one membership per entity. Contact the site administrator if you need assistance.'); } } diff --git a/CRM/Contribute/Form/ContributionView.php b/CRM/Contribute/Form/ContributionView.php index bc424d309a..3c28006e65 100644 --- a/CRM/Contribute/Form/ContributionView.php +++ b/CRM/Contribute/Form/ContributionView.php @@ -65,7 +65,7 @@ class CRM_Contribute_Form_ContributionView extends CRM_Core_Form { $values['contribution_page_title'] = CRM_Utils_Array::value(CRM_Utils_Array::value('contribution_page_id', $values), $contribPages); } - // get recieved into i.e to_financial_account_id from last trxn + // get received into i.e to_financial_account_id from last trxn $financialTrxnId = CRM_Core_BAO_FinancialTrxn::getFinancialTrxnId($values['contribution_id'], 'DESC'); $values['to_financial_account'] = ''; if (!empty($financialTrxnId['financialTrxnId'])) { diff --git a/CRM/Core/BAO/Address.php b/CRM/Core/BAO/Address.php index 67e2d753ca..287a4975e9 100644 --- a/CRM/Core/BAO/Address.php +++ b/CRM/Core/BAO/Address.php @@ -206,7 +206,7 @@ class CRM_Core_BAO_Address extends CRM_Core_DAO_Address { */ public static function fixAddress(&$params) { if (!empty($params['billing_street_address'])) { - //Check address is comming from online contribution / registration page + //Check address is coming from online contribution / registration page //Fixed :CRM-5076 $billing = array( 'street_address' => 'billing_street_address', diff --git a/CRM/Core/BAO/Block.php b/CRM/Core/BAO/Block.php index 541e4791db..3131756955 100644 --- a/CRM/Core/BAO/Block.php +++ b/CRM/Core/BAO/Block.php @@ -464,7 +464,7 @@ class CRM_Core_BAO_Block { if (!empty($params['is_primary'])) { $sql = "UPDATE $table SET is_primary = 0 WHERE contact_id = %1"; $sqlParams = array(1 => array($contactId, 'Integer')); - // we don't want to create unecessary entries in the log_ tables so exclude the one we are working on + // we don't want to create unnecessary entries in the log_ tables so exclude the one we are working on if (!empty($params['id'])) { $sql .= " AND id <> %2"; $sqlParams[2] = array($params['id'], 'Integer'); diff --git a/CRM/Core/BAO/ConfigSetting.php b/CRM/Core/BAO/ConfigSetting.php index c2104d6712..94733d4114 100644 --- a/CRM/Core/BAO/ConfigSetting.php +++ b/CRM/Core/BAO/ConfigSetting.php @@ -113,7 +113,7 @@ class CRM_Core_BAO_ConfigSetting { } } - //keep user preferred language upto date, CRM-7746 + //keep user preferred language up to date, CRM-7746 $session = CRM_Core_Session::singleton(); $lcMessages = CRM_Utils_Array::value('lcMessages', $params); if ($lcMessages && $session->get('userID')) { diff --git a/CRM/Core/BAO/CustomField.php b/CRM/Core/BAO/CustomField.php index e80bbb153c..69ece739fe 100644 --- a/CRM/Core/BAO/CustomField.php +++ b/CRM/Core/BAO/CustomField.php @@ -336,7 +336,7 @@ class CRM_Core_BAO_CustomField extends CRM_Core_DAO_CustomField { * Value we want to set the is_active field. * * @return Object - * DAO object on sucess, null otherwise + * DAO object on success, null otherwise * */ public static function setIsActive($id, $is_active) { diff --git a/CRM/Core/BAO/CustomGroup.php b/CRM/Core/BAO/CustomGroup.php index 5fca431829..613dd69f1c 100644 --- a/CRM/Core/BAO/CustomGroup.php +++ b/CRM/Core/BAO/CustomGroup.php @@ -244,7 +244,7 @@ class CRM_Core_BAO_CustomGroup extends CRM_Core_DAO_CustomGroup { * Value we want to set the is_active field. * * @return Object - * DAO object on sucess, null otherwise + * DAO object on success, null otherwise */ public static function setIsActive($id, $is_active) { // reset the cache diff --git a/CRM/Core/BAO/CustomValueTable.php b/CRM/Core/BAO/CustomValueTable.php index 287d192e73..4892559ae0 100644 --- a/CRM/Core/BAO/CustomValueTable.php +++ b/CRM/Core/BAO/CustomValueTable.php @@ -616,7 +616,7 @@ AND cf.id IN ( $fieldIDList ) * To get the values of custom fields with IDs 13 and 43 for contact ID 1327, use: * $params = array( 'entityID' => 1327, 'custom_13' => 1, 'custom_43' => 1 ); * - * Entity Type will be infered by the custom fields you request + * Entity Type will be inferred by the custom fields you request * Specify $params['entityType'] if you do not supply any custom fields to return * and entity type is other than Contact * diff --git a/CRM/Core/BAO/FinancialTrxn.php b/CRM/Core/BAO/FinancialTrxn.php index f6cfc85918..98ab1f9b15 100644 --- a/CRM/Core/BAO/FinancialTrxn.php +++ b/CRM/Core/BAO/FinancialTrxn.php @@ -193,7 +193,7 @@ LIMIT 1;"; * Id of the entity usually the contactID. * * @return array - * array of catagory id's the contact belongs to. + * array of category id's the contact belongs to. * */ public static function getFinancialTrxnTotal($entity_id) { @@ -269,7 +269,7 @@ WHERE ef2.financial_trxn_id =%1 * Name of the entity table usually 'civicrm_contact'. * * @return array - * array of catagory id's the contact belongs to. + * array of category id's the contact belongs to. * */ public static function getFinancialTrxnLineTotal($entity_id, $entity_table = 'civicrm_contribution') { diff --git a/CRM/Core/BAO/Job.php b/CRM/Core/BAO/Job.php index 9342e1b3c3..1283ca2f1c 100644 --- a/CRM/Core/BAO/Job.php +++ b/CRM/Core/BAO/Job.php @@ -91,7 +91,7 @@ class CRM_Core_BAO_Job extends CRM_Core_DAO_Job { * Value we want to set the is_active field. * * @return Object - * DAO object on sucess, null otherwise + * DAO object on success, null otherwise * */ public static function setIsActive($id, $is_active) { diff --git a/CRM/Core/BAO/LocationType.php b/CRM/Core/BAO/LocationType.php index 9a87b7bf7d..1cd5479c00 100644 --- a/CRM/Core/BAO/LocationType.php +++ b/CRM/Core/BAO/LocationType.php @@ -77,7 +77,7 @@ class CRM_Core_BAO_LocationType extends CRM_Core_DAO_LocationType { * Value we want to set the is_active field. * * @return Object - * DAO object on sucess, null otherwise + * DAO object on success, null otherwise * */ public static function setIsActive($id, $is_active) { diff --git a/CRM/Core/BAO/Mapping.php b/CRM/Core/BAO/Mapping.php index c7bd041d2f..e47efb9736 100644 --- a/CRM/Core/BAO/Mapping.php +++ b/CRM/Core/BAO/Mapping.php @@ -563,7 +563,7 @@ class CRM_Core_BAO_Mapping extends CRM_Core_DAO_Mapping { foreach ($sel1 as $key => $sel) { if ($key) { - // sort everything BUT the contactType which is sorted seperately by + // sort everything BUT the contactType which is sorted separately by // an initial commit of CRM-13278 (check ksort above) if (!in_array($key, $contactType)) { asort($mapperFields[$key]); diff --git a/CRM/Core/BAO/MessageTemplate.php b/CRM/Core/BAO/MessageTemplate.php index 8e46da4fd9..48518b8be7 100644 --- a/CRM/Core/BAO/MessageTemplate.php +++ b/CRM/Core/BAO/MessageTemplate.php @@ -69,7 +69,7 @@ class CRM_Core_BAO_MessageTemplate extends CRM_Core_DAO_MessageTemplate { * Value we want to set the is_active field. * * @return Object - * DAO object on sucess, NULL otherwise + * DAO object on success, NULL otherwise */ public static function setIsActive($id, $is_active) { return CRM_Core_DAO::setFieldValue('CRM_Core_DAO_MessageTemplate', $id, 'is_active', $is_active); diff --git a/CRM/Core/BAO/OptionGroup.php b/CRM/Core/BAO/OptionGroup.php index 276d9b25c0..f23966a806 100644 --- a/CRM/Core/BAO/OptionGroup.php +++ b/CRM/Core/BAO/OptionGroup.php @@ -70,7 +70,7 @@ class CRM_Core_BAO_OptionGroup extends CRM_Core_DAO_OptionGroup { * Value we want to set the is_active field. * * @return Object - * DAO object on sucess, null otherwise + * DAO object on success, null otherwise */ public static function setIsActive($id, $is_active) { return CRM_Core_DAO::setFieldValue('CRM_Core_DAO_OptionGroup', $id, 'is_active', $is_active); diff --git a/CRM/Core/BAO/OptionValue.php b/CRM/Core/BAO/OptionValue.php index 116bcbca48..64ee49689d 100644 --- a/CRM/Core/BAO/OptionValue.php +++ b/CRM/Core/BAO/OptionValue.php @@ -153,7 +153,7 @@ class CRM_Core_BAO_OptionValue extends CRM_Core_DAO_OptionValue { * Value we want to set the is_active field. * * @return Object - * DAO object on sucess, null otherwise + * DAO object on success, null otherwise */ public static function setIsActive($id, $is_active) { return CRM_Core_DAO::setFieldValue('CRM_Core_DAO_OptionValue', $id, 'is_active', $is_active); diff --git a/CRM/Core/BAO/PreferencesDate.php b/CRM/Core/BAO/PreferencesDate.php index 18898031a1..be24f97c99 100644 --- a/CRM/Core/BAO/PreferencesDate.php +++ b/CRM/Core/BAO/PreferencesDate.php @@ -76,7 +76,7 @@ class CRM_Core_BAO_PreferencesDate extends CRM_Core_DAO_PreferencesDate { * Value we want to set the is_active field. * * @return void - * DAO object on sucess, null otherwise + * DAO object on success, null otherwise * */ public static function setIsActive($id, $is_active) { diff --git a/CRM/Core/BAO/RecurringEntity.php b/CRM/Core/BAO/RecurringEntity.php index 5402d5a3a5..caf8249062 100644 --- a/CRM/Core/BAO/RecurringEntity.php +++ b/CRM/Core/BAO/RecurringEntity.php @@ -324,7 +324,7 @@ class CRM_Core_BAO_RecurringEntity extends CRM_Core_DAO_RecurringEntity { } /** - * This function iterates through when object criterias and + * This function iterates through when object criteria and * generates recursive dates based on that * * @return array @@ -989,11 +989,11 @@ class CRM_Core_BAO_RecurringEntity extends CRM_Core_DAO_RecurringEntity { } /** - * This function takes criterias saved in civicrm_action_schedule table + * This function takes criteria saved in civicrm_action_schedule table * and creates recursion rule * * @param array $scheduleReminderDetails - * Array of repeat criterias saved in civicrm_action_schedule table . + * Array of repeat criteria saved in civicrm_action_schedule table . * * @return object * When object diff --git a/CRM/Core/BAO/Tag.php b/CRM/Core/BAO/Tag.php index a8c53d7969..9d7e976b29 100644 --- a/CRM/Core/BAO/Tag.php +++ b/CRM/Core/BAO/Tag.php @@ -208,10 +208,10 @@ class CRM_Core_BAO_Tag extends CRM_Core_DAO_Tag { $tags = array(); } // We need to build a list of tags ordered by hierarchy and sorted by - // name. The heirarchy will be communicated by an accumulation of + // name. The hierarchy will be communicated by an accumulation of // separators in front of the name to give it a visual offset. // Instead of recursively making mysql queries, we'll make one big - // query and build the heirarchy with the algorithm below. + // query and build the hierarchy with the algorithm below. $args = array(1 => array('%' . $usedFor . '%', 'String')); $query = "SELECT id, name, parent_id, is_tagset, is_selectable FROM civicrm_tag @@ -323,7 +323,7 @@ class CRM_Core_BAO_Tag extends CRM_Core_DAO_Tag { */ public static function del($id) { // since this is a destructive operation, lets make sure - // id is a postive number + // id is a positive number CRM_Utils_Type::validate($id, 'Positive'); // delete all crm_entity_tag records with the selected tag id diff --git a/CRM/Core/BAO/UFField.php b/CRM/Core/BAO/UFField.php index 83d56486b7..5b6204053c 100644 --- a/CRM/Core/BAO/UFField.php +++ b/CRM/Core/BAO/UFField.php @@ -83,7 +83,7 @@ class CRM_Core_BAO_UFField extends CRM_Core_DAO_UFField { * Value we want to set the is_active field. * * @return Object - * DAO object on sucess, null otherwise + * DAO object on success, null otherwise */ public static function setIsActive($id, $is_active) { //check if custom data profile field is disabled diff --git a/CRM/Core/BAO/UFGroup.php b/CRM/Core/BAO/UFGroup.php index dac46e3f2c..542e3e8442 100644 --- a/CRM/Core/BAO/UFGroup.php +++ b/CRM/Core/BAO/UFGroup.php @@ -2877,7 +2877,7 @@ AND ( entity_id IS NULL OR entity_id <= 0 ) * @param int $contactId * * @return array - * assoicated formatted array + * associated formatted array */ public static function formatFields($params, $contactId = NULL) { if ($contactId) { diff --git a/CRM/Core/BAO/UFMatch.php b/CRM/Core/BAO/UFMatch.php index 0f24bba2d3..198b0d2037 100644 --- a/CRM/Core/BAO/UFMatch.php +++ b/CRM/Core/BAO/UFMatch.php @@ -39,7 +39,7 @@ class CRM_Core_BAO_UFMatch extends CRM_Core_DAO_UFMatch { /** - * Create UF Match, Note that thsi function is here in it's simplest form @ the moment + * Create UF Match, Note that this function is here in it's simplest form @ the moment * * @param $params * diff --git a/CRM/Core/CodeGen/Specification.php b/CRM/Core/CodeGen/Specification.php index c93debfeb6..86c69c0b28 100644 --- a/CRM/Core/CodeGen/Specification.php +++ b/CRM/Core/CodeGen/Specification.php @@ -412,7 +412,7 @@ class CRM_Core_CodeGen_Specification { 'nameColumn', // Where clause snippet (will be joined to the rest of the query with AND operator) 'condition', - // callback funtion incase of static arrays + // callback function incase of static arrays 'callback', // Path to options edit form 'optionEditPath', @@ -575,7 +575,7 @@ class CRM_Core_CodeGen_Specification { 'key' => trim($this->value('key', $foreignXML)), 'import' => $this->value('import', $foreignXML, FALSE), 'export' => $this->value('import', $foreignXML, FALSE), - // we do this matching in a seperate phase (resolveForeignKeys) + // we do this matching in a separate phase (resolveForeignKeys) 'className' => NULL, 'onDelete' => $this->value('onDelete', $foreignXML, FALSE), ); diff --git a/CRM/Core/Controller.php b/CRM/Core/Controller.php index fd5e00da81..0e30d6172f 100644 --- a/CRM/Core/Controller.php +++ b/CRM/Core/Controller.php @@ -433,7 +433,7 @@ class CRM_Core_Controller extends HTML_QuickForm_Controller { * * @param CRM_Core_StateMachine $stateMachine * @param \const|int $action the mode in which the state machine is operating - * typicaly this will be add/view/edit + * typically this will be add/view/edit * * @return void */ @@ -855,7 +855,7 @@ class CRM_Core_Controller extends HTML_QuickForm_Controller { } public function invalidKeyCommon() { - $msg = ts('We can\'t load the requested web page. This page requires cookies to be enabled in your browser settings. Please check this setting and enable cookies (if they are not enabled). Then try again. If this error persists, contact the site adminstrator for assistance.') . '

' . ts('Site Administrators: This error may indicate that users are accessing this page using a domain or URL other than the configured Base URL. EXAMPLE: Base URL is http://example.org, but some users are accessing the page via http://www.example.org or a domain alias like http://myotherexample.org.') . '

' . ts('Error type: Could not find a valid session key.'); + $msg = ts('We can\'t load the requested web page. This page requires cookies to be enabled in your browser settings. Please check this setting and enable cookies (if they are not enabled). Then try again. If this error persists, contact the site administrator for assistance.') . '

' . ts('Site Administrators: This error may indicate that users are accessing this page using a domain or URL other than the configured Base URL. EXAMPLE: Base URL is http://example.org, but some users are accessing the page via http://www.example.org or a domain alias like http://myotherexample.org.') . '

' . ts('Error type: Could not find a valid session key.'); CRM_Core_Error::fatal($msg); } diff --git a/CRM/Core/DAO.php b/CRM/Core/DAO.php index 6bba6d741a..17a9451412 100644 --- a/CRM/Core/DAO.php +++ b/CRM/Core/DAO.php @@ -220,7 +220,7 @@ class CRM_Core_DAO extends DB_DataObject { break; case CRM_Utils_Type::T_TIME: - CRM_Core_Error::fatal('T_TIME shouldnt be used.'); + CRM_Core_Error::fatal('T_TIME shouldn't be used.'); //$object->$dbName='000000'; //break; case CRM_Utils_Type::T_CCNUM: @@ -2384,7 +2384,7 @@ SELECT contact_id } // the string is longer than the length and we need a uniq string - // for the same tablename we need the same uniq string everytime + // for the same tablename we need the same uniq string every time // hence we use md5 on the string, which is not random // we'll append 8 characters to the end of the tableName $md5string = substr(md5($string), 0, 8); diff --git a/CRM/Core/Form.php b/CRM/Core/Form.php index 4bddc368b0..643c882e2e 100644 --- a/CRM/Core/Form.php +++ b/CRM/Core/Form.php @@ -488,7 +488,7 @@ class CRM_Core_Form extends HTML_QuickForm_Page { } // call the form hook - // also call the hook function so any modules can set thier own custom defaults + // also call the hook function so any modules can set their own custom defaults // the user can do both the form and set default values with this hook CRM_Utils_Hook::buildForm(get_class($this), $this); @@ -1252,7 +1252,7 @@ class CRM_Core_Form extends HTML_QuickForm_Page { } $props += CRM_Utils_Array::value('html', $fieldSpec, array()); CRM_Utils_Array::remove($props, 'entity', 'name', 'context', 'label', 'action', 'type'); - // TODO: refactor switch statement, to seperate methods. + // TODO: refactor switch statement, to separate methods. switch ($widget) { case 'Text': case 'Link': diff --git a/CRM/Core/I18n.php b/CRM/Core/I18n.php index a36389ec7f..cc88166c60 100644 --- a/CRM/Core/I18n.php +++ b/CRM/Core/I18n.php @@ -490,7 +490,7 @@ class CRM_Core_I18n { } } catch (CRM_Extension_Exception $e) { - // Intentionally not translating this string to avoid possible infinit loops + // Intentionally not translating this string to avoid possible infinite loops // Only developers should see this string, if they made a mistake in their ts() usage. CRM_Core_Session::setStatus('Unknown extension key in a translation string: ' . $key, '', 'error'); $this->_extensioncache[$key] = FALSE; diff --git a/CRM/Core/Lock.php b/CRM/Core/Lock.php index bfa40d0db8..0a096909f8 100644 --- a/CRM/Core/Lock.php +++ b/CRM/Core/Lock.php @@ -152,7 +152,7 @@ class CRM_Core_Lock { */ public function hackyHandleBrokenCode($jobLog) { if (stristr($this->_name, 'job')) { - throw new CRM_Core_Exception('lock aquisition for ' . $this->_name . 'attempted when ' . $jobLog . 'is not released'); + throw new CRM_Core_Exception('lock acquisition for ' . $this->_name . 'attempted when ' . $jobLog . 'is not released'); } if (defined('CIVICRM_LOCK_DEBUG')) { CRM_Core_Error::debug_log_message('(CRM-12856) faking lock for ' . $this->_name); diff --git a/CRM/Core/Menu.php b/CRM/Core/Menu.php index 233dbbd220..6fdda3fa65 100644 --- a/CRM/Core/Menu.php +++ b/CRM/Core/Menu.php @@ -502,7 +502,7 @@ class CRM_Core_Menu { while ($newPath = array_shift($pathElements)) { $currentPath = $currentPath ? ($currentPath . '/' . $newPath) : $newPath; - // when we come accross breadcrumb which involves ids, + // when we come across breadcrumb which involves ids, // we should skip now and later on append dynamically. if (isset($menu[$currentPath]['skipBreadcrumb'])) { continue; diff --git a/CRM/Core/OptionGroup.php b/CRM/Core/OptionGroup.php index 06464c999c..6975d496ca 100644 --- a/CRM/Core/OptionGroup.php +++ b/CRM/Core/OptionGroup.php @@ -89,7 +89,7 @@ class CRM_Core_OptionGroup { * This function retrieves all the values for the specific option group by name * this is primarily used to create various html based form elements * (radio, select, checkbox etc). OptionGroups for most cases have the - * 'label' in the label colum and the 'id' or 'name' in the value column + * 'label' in the label column and the 'id' or 'name' in the value column * * @param string $name * name of the option group. @@ -201,7 +201,7 @@ WHERE v.option_group_id = g.id * This function retrieves all the values for the specific option group by id. * this is primarily used to create various html based form elements * (radio, select, checkbox etc). OptionGroups for most cases have the - * 'label' in the label colum and the 'id' or 'name' in the value column + * 'label' in the label column and the 'id' or 'name' in the value column * * @param int $id * id of the option group. diff --git a/CRM/Core/Payment/AuthorizeNet.php b/CRM/Core/Payment/AuthorizeNet.php index cc9cf7cd5c..11300a7d06 100644 --- a/CRM/Core/Payment/AuthorizeNet.php +++ b/CRM/Core/Payment/AuthorizeNet.php @@ -88,7 +88,7 @@ class CRM_Core_Payment_AuthorizeNet extends CRM_Core_Payment { } /* - * recurpayment function does not compile an array & then proces it - + * recurpayment function does not compile an array & then process it - * - the tpl does the transformation so adding call to hook here * & giving it a change to act on the params array */ diff --git a/CRM/Core/Payment/PayPalImpl.php b/CRM/Core/Payment/PayPalImpl.php index 838542d15f..6e121f658c 100644 --- a/CRM/Core/Payment/PayPalImpl.php +++ b/CRM/Core/Payment/PayPalImpl.php @@ -782,7 +782,7 @@ class CRM_Core_Payment_PayPalImpl extends CRM_Core_Payment { /** * This function will take NVPString and convert it to an Associative Array and it will decode the response. - * It is usefull to search for a particular key and displaying arrays. + * It is useful to search for a particular key and displaying arrays. * @nvpstr is NVPString. * @nvpArray is Associative Array. */ @@ -790,7 +790,7 @@ class CRM_Core_Payment_PayPalImpl extends CRM_Core_Payment { $result = array(); while (strlen($str)) { - // postion of key + // position of key $keyPos = strpos($str, '='); // position of value diff --git a/CRM/Core/Payment/PayPalProIPN.php b/CRM/Core/Payment/PayPalProIPN.php index 7d0556b471..9676338f81 100644 --- a/CRM/Core/Payment/PayPalProIPN.php +++ b/CRM/Core/Payment/PayPalProIPN.php @@ -207,12 +207,12 @@ class CRM_Core_Payment_PayPalProIPN extends CRM_Core_Payment_BaseIPN { //List of Transaction Type /* recurring_payment_profile_created RP Profile Created - recurring_payment RP Sucessful Payment + recurring_payment RP Successful Payment recurring_payment_failed RP Failed Payment recurring_payment_profile_cancel RP Profile Cancelled recurring_payment_expired RP Profile Expired recurring_payment_skipped RP Profile Skipped - recurring_payment_outstanding_payment RP Sucessful Outstanding Payment + recurring_payment_outstanding_payment RP Successful Outstanding Payment recurring_payment_outstanding_payment_failed RP Failed Outstanding Payment recurring_payment_suspended RP Profile Suspended recurring_payment_suspended_due_to_max_failed_payment RP Profile Suspended due to Max Failed Payment diff --git a/CRM/Core/Payment/Realex.php b/CRM/Core/Payment/Realex.php index b137295c97..8665b5d02b 100644 --- a/CRM/Core/Payment/Realex.php +++ b/CRM/Core/Payment/Realex.php @@ -205,7 +205,7 @@ class CRM_Core_Payment_Realex extends CRM_Core_Payment { curl_close($submit); - // Tidy up the responce xml + // Tidy up the response xml $response_xml = preg_replace("/[\s\t]/", " ", $response_xml); $response_xml = preg_replace("/[\n\r]/", "", $response_xml); diff --git a/CRM/Core/Payment/eWAY.php b/CRM/Core/Payment/eWAY.php index f6504d7e2d..16fec49e81 100644 --- a/CRM/Core/Payment/eWAY.php +++ b/CRM/Core/Payment/eWAY.php @@ -44,7 +44,7 @@ | Plus a bit of our own code of course - Peter Barwell | | contact PB@DolphinSoftware.com.au if required. | | | - | NOTE: This initial eWAY module does not yet allow for recuring | + | NOTE: This initial eWAY module does not yet allow for recurring | | payments - contact Peter Barwell or add yourself (or both) | | | | NOTE: The eWAY gateway only allows a single currency per account | @@ -359,7 +359,7 @@ class CRM_Core_Payment_eWAY extends CRM_Core_Payment { // received an OK status from eWAY, but their Gateway has not returned the correct unique // token - ie something is broken, BUT money has been taken from the client's account, // so we can't very well error-out as CiviCRM will then not process the registration. - // There is an error message commented out here but my prefered response to this unlikley + // There is an error message commented out here but my preferred response to this unlikley // possibility is to email 'support@eWAY.com.au' //----------------------------------------------------------------------------------------------------- $eWayTrxnReference_OUT = $eWAYRequest->GetTransactionNumber(); @@ -378,7 +378,7 @@ class CRM_Core_Payment_eWAY extends CRM_Core_Payment { // Test mode always returns trxn_id = 0 - so we fix that here // // NOTE: This code was taken from the AuthorizeNet payment processor, however it now appears - // unecessary for the eWAY gateway - Left here in case it proves useful + // unnecessary for the eWAY gateway - Left here in case it proves useful //---------------------------------------------------------------------------------------------------- if ( $this->_mode == 'test' ) { $query = "SELECT MAX(trxn_id) FROM civicrm_contribution WHERE trxn_id LIKE 'test%'"; diff --git a/CRM/Core/PseudoConstant.php b/CRM/Core/PseudoConstant.php index dfb32d7806..c042f436c2 100644 --- a/CRM/Core/PseudoConstant.php +++ b/CRM/Core/PseudoConstant.php @@ -1433,7 +1433,7 @@ WHERE id = %1"; $condition .= " AND ( $additionalCond ) "; } - // CRM-7178. Make sure we only include payment processors valid in ths + // CRM-7178. Make sure we only include payment processors valid in this // domain $condition .= " AND domain_id = " . CRM_Core_Config::domainID(); diff --git a/CRM/Core/Smarty/plugins/function.crmAPI.php b/CRM/Core/Smarty/plugins/function.crmAPI.php index bd65a5a4bc..3860200240 100644 --- a/CRM/Core/Smarty/plugins/function.crmAPI.php +++ b/CRM/Core/Smarty/plugins/function.crmAPI.php @@ -60,7 +60,7 @@ function smarty_function_crmAPI($params, &$smarty) { $result = civicrm_api($entity, $action, $params); unset($errorScope); if ($result === FALSE) { - $smarty->trigger_error("Unkown error"); + $smarty->trigger_error("Unknown error"); return; } diff --git a/CRM/Core/StateMachine.php b/CRM/Core/StateMachine.php index f106c773e1..4b38627772 100644 --- a/CRM/Core/StateMachine.php +++ b/CRM/Core/StateMachine.php @@ -37,7 +37,7 @@ * Core StateMachine. All statemachines subclass for the core one * for functionality specific to their needs. * - * A statemachine keeps track of differnt states and forms for a + * A statemachine keeps track of different states and forms for a * html quickform controller. * */ diff --git a/CRM/Core/Transaction.php b/CRM/Core/Transaction.php index 6cc7260f55..20551b2467 100644 --- a/CRM/Core/Transaction.php +++ b/CRM/Core/Transaction.php @@ -176,7 +176,7 @@ class CRM_Core_Transaction { * use it again. * * @param string $callable - * Should exception one paramter (CRM_Core_Transaction $tx). + * Should exception one parameter (CRM_Core_Transaction $tx). * @return CRM_Core_Transaction * @throws Exception */ diff --git a/CRM/Custom/Form/ChangeFieldType.php b/CRM/Custom/Form/ChangeFieldType.php index c8dc49c33b..9ce6049a81 100644 --- a/CRM/Custom/Form/ChangeFieldType.php +++ b/CRM/Custom/Form/ChangeFieldType.php @@ -59,7 +59,7 @@ class CRM_Custom_Form_ChangeFieldType extends CRM_Core_Form { * Set up variables to build the form. * * @return void - * @acess protected + * @access protected */ public function preProcess() { $this->_id = CRM_Utils_Request::retrieve('id', 'Positive', diff --git a/CRM/Custom/Form/DeleteField.php b/CRM/Custom/Form/DeleteField.php index 322524dd6e..b45a5c4dad 100644 --- a/CRM/Custom/Form/DeleteField.php +++ b/CRM/Custom/Form/DeleteField.php @@ -56,7 +56,7 @@ class CRM_Custom_Form_DeleteField extends CRM_Core_Form { * Set up variables to build the form. * * @return void - * @acess protected + * @access protected */ public function preProcess() { $this->_id = $this->get('id'); diff --git a/CRM/Custom/Form/DeleteGroup.php b/CRM/Custom/Form/DeleteGroup.php index 99e019b22d..4506d85975 100644 --- a/CRM/Custom/Form/DeleteGroup.php +++ b/CRM/Custom/Form/DeleteGroup.php @@ -56,7 +56,7 @@ class CRM_Custom_Form_DeleteGroup extends CRM_Core_Form { * Set up variables to build the form. * * @return void - * @acess protected + * @access protected */ public function preProcess() { $this->_id = $this->get('id'); diff --git a/CRM/Custom/Form/MoveField.php b/CRM/Custom/Form/MoveField.php index c3f7138f4e..b868c93d8d 100644 --- a/CRM/Custom/Form/MoveField.php +++ b/CRM/Custom/Form/MoveField.php @@ -77,7 +77,7 @@ class CRM_Custom_Form_MoveField extends CRM_Core_Form { * Set up variables to build the form. * * @return void - * @acess protected + * @access protected */ public function preProcess() { $this->_srcFID = CRM_Utils_Request::retrieve('fid', 'Positive', diff --git a/CRM/Custom/Import/Form/MapField.php b/CRM/Custom/Import/Form/MapField.php index 5f6b2bda3a..51d1faedbf 100644 --- a/CRM/Custom/Import/Form/MapField.php +++ b/CRM/Custom/Import/Form/MapField.php @@ -25,7 +25,7 @@ class CRM_Custom_Import_Form_MapField extends CRM_Contact_Import_Form_MapField { $this->assign('columnCount', $this->_columnCount); $this->_dataValues = $this->get('dataValues'); - //Seperate column names from actual values. + //Separate column names from actual values. $columnNames = $this->_dataValues[0]; //actual values need to be in 2d array ($array[$i][$j]) format to be parsed by the template. $dataValues[] = $this->_dataValues[1]; diff --git a/CRM/Custom/Import/Form/Preview.php b/CRM/Custom/Import/Form/Preview.php index 56887cbcf5..78301032d9 100644 --- a/CRM/Custom/Import/Form/Preview.php +++ b/CRM/Custom/Import/Form/Preview.php @@ -121,7 +121,7 @@ class CRM_Custom_Import_Form_Preview extends CRM_Import_Form_Preview { // add all the necessary variables to the form $parser->set($this, CRM_Import_Parser::MODE_IMPORT); - // check if there is any error occured + // check if there is any error occurred $errorStack = CRM_Core_Error::singleton(); $errors = $errorStack->getErrors(); diff --git a/CRM/Dedupe/Finder.php b/CRM/Dedupe/Finder.php index 2268bf865d..723f416db0 100644 --- a/CRM/Dedupe/Finder.php +++ b/CRM/Dedupe/Finder.php @@ -279,7 +279,7 @@ class CRM_Dedupe_Finder { if (substr_count($key, '.')) { $last = explode('.', $key); $last = array_pop($last); - // make sure the first occurence is kept, not the last + // make sure the first occurrence is kept, not the last if (!isset($flat[$last])) { $flat[$last] = $value; } diff --git a/CRM/Dedupe/Merger.php b/CRM/Dedupe/Merger.php index a49f15c546..8566e7a183 100644 --- a/CRM/Dedupe/Merger.php +++ b/CRM/Dedupe/Merger.php @@ -403,7 +403,7 @@ INNER JOIN civicrm_membership membership2 ON membership1.membership_type_id = m case 'civicrm_uf_match': // normal queries won't work for uf_match since that will lead to violation of unique constraint, - // failing to meet intended result. Therefore we introduce this additonal query: + // failing to meet intended result. Therefore we introduce this additional query: $sqls[] = "DELETE FROM civicrm_uf_match WHERE contact_id = {$mainId}"; break; } diff --git a/CRM/Event/BAO/Event.php b/CRM/Event/BAO/Event.php index 84c64b4bfa..00372391d9 100644 --- a/CRM/Event/BAO/Event.php +++ b/CRM/Event/BAO/Event.php @@ -70,7 +70,7 @@ class CRM_Event_BAO_Event extends CRM_Event_DAO_Event { * Value we want to set the is_active field. * * @return Object - * DAO object on sucess, null otherwise + * DAO object on success, null otherwise */ public static function setIsActive($id, $is_active) { return CRM_Core_DAO::setFieldValue('CRM_Event_DAO_Event', $id, 'is_active', $is_active); diff --git a/CRM/Event/Form/Registration/Confirm.php b/CRM/Event/Form/Registration/Confirm.php index 8075840714..1e7afe8ee3 100644 --- a/CRM/Event/Form/Registration/Confirm.php +++ b/CRM/Event/Form/Registration/Confirm.php @@ -766,7 +766,7 @@ class CRM_Event_Form_Registration_Confirm extends CRM_Event_Form_Registration { } } - //update status and send mail to cancelled additonal participants, CRM-4320 + //update status and send mail to cancelled additional participants, CRM-4320 if ($this->_allowConfirmation && is_array($cancelledIds) && !empty($cancelledIds)) { $cancelledId = array_search('Cancelled', CRM_Event_PseudoConstant::participantStatus(NULL, "class = 'Negative'") diff --git a/CRM/Event/Form/Registration/Register.php b/CRM/Event/Form/Registration/Register.php index fab803166b..8611fd155c 100644 --- a/CRM/Event/Form/Registration/Register.php +++ b/CRM/Event/Form/Registration/Register.php @@ -1330,7 +1330,7 @@ class CRM_Event_Form_Registration_Register extends CRM_Event_Form_Registration { } } - // update status and send mail to cancelled additonal participants, CRM-4320 + // update status and send mail to cancelled additional participants, CRM-4320 if ($this->_allowConfirmation && is_array($cancelledIds) && !empty($cancelledIds)) { $cancelledId = array_search('Cancelled', CRM_Event_PseudoConstant::participantStatus(NULL, "class = 'Negative'") diff --git a/CRM/Event/Import/Form/Preview.php b/CRM/Event/Import/Form/Preview.php index 07566f4d09..3c4c097a34 100644 --- a/CRM/Event/Import/Form/Preview.php +++ b/CRM/Event/Import/Form/Preview.php @@ -150,7 +150,7 @@ class CRM_Event_Import_Form_Preview extends CRM_Import_Form_Preview { // add all the necessary variables to the form $parser->set($this, CRM_Import_Parser::MODE_IMPORT); - // check if there is any error occured + // check if there is any error occurred $errorStack = CRM_Core_Error::singleton(); $errors = $errorStack->getErrors(); diff --git a/CRM/Export/BAO/Export.php b/CRM/Export/BAO/Export.php index a2fbc61a1b..9f38ef0588 100644 --- a/CRM/Export/BAO/Export.php +++ b/CRM/Export/BAO/Export.php @@ -160,7 +160,7 @@ class CRM_Export_BAO_Export { if (!$fieldName) { continue; } - // get phoneType id and IM service provider id seperately + // get phoneType id and IM service provider id separately if ($fieldName == 'phone') { $phoneTypeId = CRM_Utils_Array::value(3, $value); } @@ -1394,7 +1394,7 @@ INSERT INTO {$componentTable} SELECT distinct gc.contact_id FROM civicrm_group_c else { if (substr($fieldName, -3, 3) == '_id') { // for trxn_id and its variants use a longer buffer - // to accomodate different systems - CRM-13739 + // to accommodate different systems - CRM-13739 static $notRealIDFields = NULL; if ($notRealIDFields == NULL) { $notRealIDFields = array('trxn_id', 'componentpaymentfield_transaction_id'); diff --git a/CRM/Extension/Browser.php b/CRM/Extension/Browser.php index 90799b3dc4..86e3fe4928 100644 --- a/CRM/Extension/Browser.php +++ b/CRM/Extension/Browser.php @@ -216,7 +216,7 @@ class CRM_Extension_Browser { } /** - * Connects to public server and grabs the list of publically available + * Connects to public server and grabs the list of publicly available * extensions. * * diff --git a/CRM/Extension/Manager/Payment.php b/CRM/Extension/Manager/Payment.php index 5c786b6e35..a6d886e6fb 100644 --- a/CRM/Extension/Manager/Payment.php +++ b/CRM/Extension/Manager/Payment.php @@ -186,7 +186,7 @@ class CRM_Extension_Manager_Payment extends CRM_Extension_Manager_Base { * The method to call in the payment processor class. */ private function _runPaymentHook(CRM_Extension_Info $info, $method) { - // Not concerned about performance at this stage, as these are seldomly performed tasks + // Not concerned about performance at this stage, as these are seldom performed tasks // (payment processor enable/disable/install/uninstall). May wish to implement some // kind of registry/caching system if more hooks are added. diff --git a/CRM/Financial/BAO/FinancialAccount.php b/CRM/Financial/BAO/FinancialAccount.php index 72c29b0da8..47622d6842 100644 --- a/CRM/Financial/BAO/FinancialAccount.php +++ b/CRM/Financial/BAO/FinancialAccount.php @@ -125,11 +125,11 @@ class CRM_Financial_BAO_FinancialAccount extends CRM_Financial_DAO_FinancialAcco $check = FALSE; //check dependencies - $dependancy = array( + $dependency = array( array('Core', 'FinancialTrxn', 'to_financial_account_id'), array('Financial', 'FinancialTypeAccount', 'financial_account_id'), ); - foreach ($dependancy as $name) { + foreach ($dependency as $name) { require_once str_replace('_', DIRECTORY_SEPARATOR, "CRM_" . $name[0] . "_BAO_" . $name[1]) . ".php"; $className = "CRM_{$name[0]}_BAO_{$name[1]}"; $bao = new $className(); diff --git a/CRM/Financial/BAO/FinancialType.php b/CRM/Financial/BAO/FinancialType.php index f76762b874..237861a9ab 100644 --- a/CRM/Financial/BAO/FinancialType.php +++ b/CRM/Financial/BAO/FinancialType.php @@ -75,7 +75,7 @@ class CRM_Financial_BAO_FinancialType extends CRM_Financial_DAO_FinancialType { * Value we want to set the is_active field. * * @return Object - * DAO object on sucess, null otherwise + * DAO object on success, null otherwise */ public static function setIsActive($id, $is_active) { return CRM_Core_DAO::setFieldValue('CRM_Financial_DAO_FinancialType', $id, 'is_active', $is_active); @@ -133,8 +133,8 @@ class CRM_Financial_BAO_FinancialType extends CRM_Financial_DAO_FinancialType { $occurrences = $financialType->findReferences(); if ($occurrences) { $tables = array(); - foreach ($occurrences as $occurence) { - $className = get_class($occurence); + foreach ($occurrences as $occurrence) { + $className = get_class($occurrence); if (!in_array($className, $ignoreTables)) { $tables[] = $className; } diff --git a/CRM/Financial/BAO/FinancialTypeAccount.php b/CRM/Financial/BAO/FinancialTypeAccount.php index e39511213b..27a6c5a7f5 100644 --- a/CRM/Financial/BAO/FinancialTypeAccount.php +++ b/CRM/Financial/BAO/FinancialTypeAccount.php @@ -114,7 +114,7 @@ class CRM_Financial_BAO_FinancialTypeAccount extends CRM_Financial_DAO_EntityFin $financialTypeId = CRM_Core_DAO::getFieldValue('CRM_Financial_DAO_EntityFinancialAccount', $financialTypeAccountId, 'entity_id'); //check dependencies // FIXME more table containing financial_type_id to come - $dependancy = array( + $dependency = array( array('Contribute', 'Contribution'), array('Contribute', 'ContributionPage'), array('Member', 'MembershipType'), @@ -125,7 +125,7 @@ class CRM_Financial_BAO_FinancialTypeAccount extends CRM_Financial_DAO_EntityFin array('Price', 'LineItem'), ); - foreach ($dependancy as $name) { + foreach ($dependency as $name) { $daoString = 'CRM_' . $name[0] . '_DAO_' . $name[1]; $dao = new $daoString(); $dao->financial_type_id = $financialTypeId; diff --git a/CRM/Financial/BAO/PaymentProcessorType.php b/CRM/Financial/BAO/PaymentProcessorType.php index 4962940d41..2659daa21b 100644 --- a/CRM/Financial/BAO/PaymentProcessorType.php +++ b/CRM/Financial/BAO/PaymentProcessorType.php @@ -76,7 +76,7 @@ class CRM_Financial_BAO_PaymentProcessorType extends CRM_Financial_DAO_PaymentPr * Value we want to set the is_active field. * * @return Object - * DAO object on sucess, null otherwise + * DAO object on success, null otherwise * */ public static function setIsActive($id, $is_active) { diff --git a/CRM/Grant/BAO/Grant.php b/CRM/Grant/BAO/Grant.php index 02cdaf45cc..f6d208f989 100644 --- a/CRM/Grant/BAO/Grant.php +++ b/CRM/Grant/BAO/Grant.php @@ -373,7 +373,7 @@ class CRM_Grant_BAO_Grant extends CRM_Grant_DAO_Grant { 'data_type' => CRM_Utils_Type::T_FLOAT, ), 'grant_application_received_date' => array( - 'title' => 'Grant Application Recieved Date', + 'title' => 'Grant Application Received Date', 'name' => 'grant_application_received_date', 'data_type' => CRM_Utils_Type::T_DATE, ), diff --git a/CRM/Group/Form/Edit.php b/CRM/Group/Form/Edit.php index a6733dea09..097507511c 100644 --- a/CRM/Group/Form/Edit.php +++ b/CRM/Group/Form/Edit.php @@ -84,7 +84,7 @@ class CRM_Group_Form_Edit extends CRM_Core_Form { * Set up variables to build the form. * * @return void - * @acess protected + * @access protected */ public function preProcess() { $this->_id = $this->get('id'); diff --git a/CRM/Import/DataSource/CSV.php b/CRM/Import/DataSource/CSV.php index 26e35ca20f..557e78cd4a 100644 --- a/CRM/Import/DataSource/CSV.php +++ b/CRM/Import/DataSource/CSV.php @@ -113,7 +113,7 @@ class CRM_Import_DataSource_CSV extends CRM_Import_DataSource { * @param string $table * Name of table from which data imported. * @param string $fieldSeparator - * Character that seperates the various columns in the file. + * Character that separates the various columns in the file. * * @return string * name of the created table diff --git a/CRM/Logging/Differ.php b/CRM/Logging/Differ.php index 7a5acb22b8..338e3904a9 100644 --- a/CRM/Logging/Differ.php +++ b/CRM/Logging/Differ.php @@ -171,7 +171,7 @@ WHERE lt.log_conn_id = %1 AND 3 => array($id, 'Integer'), ); - // look for all the changes in the given connection that happended less than {$this->interval} s later than log_date to the given id to catch multi-query changes + // look for all the changes in the given connection that happened less than {$this->interval} s later than log_date to the given id to catch multi-query changes $changedSQL = "SELECT * FROM `{$this->db}`.`log_$table` WHERE log_conn_id = %1 AND log_date >= %2 AND log_date < DATE_ADD(%2, INTERVAL {$this->interval}) AND id = %3 ORDER BY log_date DESC LIMIT 1"; $changedDAO = CRM_Core_DAO::executeQuery($changedSQL, $params); diff --git a/CRM/Logging/Schema.php b/CRM/Logging/Schema.php index 4753fd31e9..0c2d1ef3ff 100644 --- a/CRM/Logging/Schema.php +++ b/CRM/Logging/Schema.php @@ -177,7 +177,7 @@ AND TABLE_NAME LIKE 'log_civicrm_%' $triggers = $dao->executeQuery("SHOW TRIGGERS LIKE 'civicrm_%'"); while ($triggers->fetch()) { - // note that drop trigger has a wierd syntax and hence we do not + // note that drop trigger has a weird syntax and hence we do not // send the trigger name as a string (i.e. its not quoted $dao->executeQuery("DROP TRIGGER IF EXISTS {$triggers->Trigger}"); } diff --git a/CRM/Mailing/BAO/Component.php b/CRM/Mailing/BAO/Component.php index 204d81629b..643245a3fc 100644 --- a/CRM/Mailing/BAO/Component.php +++ b/CRM/Mailing/BAO/Component.php @@ -70,7 +70,7 @@ class CRM_Mailing_BAO_Component extends CRM_Mailing_DAO_Component { * Value we want to set the is_active field. * * @return Object - * DAO object on sucess, null otherwise + * DAO object on success, null otherwise */ public static function setIsActive($id, $is_active) { return CRM_Core_DAO::setFieldValue('CRM_Mailing_DAO_Component', $id, 'is_active', $is_active); diff --git a/CRM/Mailing/BAO/MailingJob.php b/CRM/Mailing/BAO/MailingJob.php index e810c17146..62c4657c3b 100644 --- a/CRM/Mailing/BAO/MailingJob.php +++ b/CRM/Mailing/BAO/MailingJob.php @@ -630,7 +630,7 @@ VALUES (%1, %2, %3, %4, %5, %6, %7) $count = 0; /** - * CRM-15702: Sending bulk sms to contacts without e-mail addres fails. + * CRM-15702: Sending bulk sms to contacts without e-mail address fails. * Solution is to skip checking for on hold */ $skipOnHold = TRUE; //do include a statement to check wether e-mail address is on hold diff --git a/CRM/Mailing/Event/BAO/Delivered.php b/CRM/Mailing/Event/BAO/Delivered.php index 4a4113019f..eb8c62c7ad 100755 --- a/CRM/Mailing/Event/BAO/Delivered.php +++ b/CRM/Mailing/Event/BAO/Delivered.php @@ -268,7 +268,7 @@ class CRM_Mailing_Event_BAO_Delivered extends CRM_Mailing_Event_DAO_Delivered { * we cannot decide when an email address last got an email. * * We want to avoid putting on hold an email address which had a few bounces (mbox full) and then got quite a few - * successfull deliveries before starting the bounce again. The current code does not set the resetDate and hence + * successful deliveries before starting the bounce again. The current code does not set the resetDate and hence * the above scenario results in the email being put on hold * * This function rectifies that by considering all non-test mailing jobs which have completed between $minDays and $maxDays diff --git a/CRM/Mailing/Event/BAO/Resubscribe.php b/CRM/Mailing/Event/BAO/Resubscribe.php index a25ec0ff5d..2f7c6bc6ba 100644 --- a/CRM/Mailing/Event/BAO/Resubscribe.php +++ b/CRM/Mailing/Event/BAO/Resubscribe.php @@ -186,7 +186,7 @@ class CRM_Mailing_Event_BAO_Resubscribe { } /** - * Send a reponse email informing the contact of the groups to which he/she + * Send a response email informing the contact of the groups to which he/she * has been resubscribed. * * @param string $queue_id diff --git a/CRM/Mailing/Event/BAO/Unsubscribe.php b/CRM/Mailing/Event/BAO/Unsubscribe.php index 10287840cf..425bb50327 100755 --- a/CRM/Mailing/Event/BAO/Unsubscribe.php +++ b/CRM/Mailing/Event/BAO/Unsubscribe.php @@ -292,7 +292,7 @@ WHERE email = %2 } /** - * Send a reponse email informing the contact of the groups from which he. + * Send a response email informing the contact of the groups from which he. * has been unsubscribed. * * @param string $queue_id diff --git a/CRM/Mailing/Selector/Browse.php b/CRM/Mailing/Selector/Browse.php index 86bfa6109b..029acc852c 100644 --- a/CRM/Mailing/Selector/Browse.php +++ b/CRM/Mailing/Selector/Browse.php @@ -39,7 +39,7 @@ class CRM_Mailing_Selector_Browse extends CRM_Core_Selector_Base implements CRM_Core_Selector_API { /** - * Array of supported links, currenly null + * Array of supported links, currently null * * @var array */ diff --git a/CRM/Mailing/Selector/Event.php b/CRM/Mailing/Selector/Event.php index 81b034a024..f982f65314 100644 --- a/CRM/Mailing/Selector/Event.php +++ b/CRM/Mailing/Selector/Event.php @@ -42,7 +42,7 @@ class CRM_Mailing_Selector_Event extends CRM_Core_Selector_Base implements CRM_Core_Selector_API { /** - * Array of supported links, currenly null + * Array of supported links, currently null * * @var array */ diff --git a/CRM/Member/BAO/Membership.php b/CRM/Member/BAO/Membership.php index 05c3433776..296ac341c2 100644 --- a/CRM/Member/BAO/Membership.php +++ b/CRM/Member/BAO/Membership.php @@ -1420,7 +1420,7 @@ AND civicrm_membership.is_test = %2"; } //CRM-15232: Check if membership is created and on the basis of it use - //membership reciept template to send payment reciept + //membership receipt template to send payment receipt if (count($createdMemberships)) { $form->_values['isMembership'] = TRUE; } diff --git a/CRM/Member/BAO/MembershipStatus.php b/CRM/Member/BAO/MembershipStatus.php index 4621a0b8f4..7bb0af89a3 100644 --- a/CRM/Member/BAO/MembershipStatus.php +++ b/CRM/Member/BAO/MembershipStatus.php @@ -75,7 +75,7 @@ class CRM_Member_BAO_MembershipStatus extends CRM_Member_DAO_MembershipStatus { * Value we want to set the is_active field. * * @return Object - * DAO object on sucess, null otherwise + * DAO object on success, null otherwise */ public static function setIsActive($id, $is_active) { return CRM_Core_DAO::setFieldValue('CRM_Member_DAO_MembershipStatus', $id, 'is_active', $is_active); @@ -193,8 +193,8 @@ class CRM_Member_BAO_MembershipStatus extends CRM_Member_DAO_MembershipStatus { //checking if membership status is present in some other table $check = FALSE; - $dependancy = array('Membership', 'MembershipLog'); - foreach ($dependancy as $name) { + $dependency = array('Membership', 'MembershipLog'); + foreach ($dependency as $name) { $baoString = 'CRM_Member_BAO_' . $name; $dao = new $baoString(); $dao->status_id = $membershipStatusId; diff --git a/CRM/Member/Form/Membership.php b/CRM/Member/Form/Membership.php index 3e65fbe17f..aa418417b1 100644 --- a/CRM/Member/Form/Membership.php +++ b/CRM/Member/Form/Membership.php @@ -792,8 +792,8 @@ WHERE id IN ( ' . implode(' , ', array_keys($membershipType)) . ' )'; $ids = implode(',', $priceFieldIDS); $count = CRM_Price_BAO_PriceSet::getMembershipCount($ids); - foreach ($count as $id => $occurance) { - if ($occurance > 1) { + foreach ($count as $id => $occurrence) { + if ($occurrence > 1) { $errors['_qf_default'] = ts('Select at most one option associated with the same membership type.'); } } @@ -1358,7 +1358,7 @@ WHERE id IN ( ' . implode(' , ', array_keys($membershipType)) . ' )'; CRM_Core_Payment_Form::mapParams($this->_bltID, $this->_params, $paymentParams, TRUE); // CRM-7137 -for recurring membership, - // we do need contribution and recuring records. + // we do need contribution and recurring records. $result = NULL; if (!empty($paymentParams['is_recur'])) { $contributionType = new CRM_Financial_DAO_FinancialType(); diff --git a/CRM/Member/Form/Task/PDFLetterCommon.php b/CRM/Member/Form/Task/PDFLetterCommon.php index 1ec2201939..560cfdf2f7 100644 --- a/CRM/Member/Form/Task/PDFLetterCommon.php +++ b/CRM/Member/Form/Task/PDFLetterCommon.php @@ -65,7 +65,7 @@ class CRM_Member_Form_Task_PDFLetterCommon extends CRM_Contact_Form_Task_PDFLett $contactId = $membership['contact_id']; $params = array('contact_id' => $contactId); //getTokenDetails is much like calling the api contact.get function - but - with some minor - // special handlings. It preceeds the existence of the api + // special handlings. It precedes the existence of the api list($contacts) = CRM_Utils_Token::getTokenDetails( $params, $returnProperties, diff --git a/CRM/Member/Import/Form/Preview.php b/CRM/Member/Import/Form/Preview.php index f5a9c69cc2..6fa27c704e 100644 --- a/CRM/Member/Import/Form/Preview.php +++ b/CRM/Member/Import/Form/Preview.php @@ -169,7 +169,7 @@ class CRM_Member_Import_Form_Preview extends CRM_Import_Form_Preview { // add all the necessary variables to the form $parser->set($this, CRM_Import_Parser::MODE_IMPORT); - // check if there is any error occured + // check if there is any error occurred $errorStack = CRM_Core_Error::singleton(); $errors = $errorStack->getErrors(); diff --git a/CRM/PCP/Page/PCP.php b/CRM/PCP/Page/PCP.php index 133f4bdf43..2b3972b08b 100644 --- a/CRM/PCP/Page/PCP.php +++ b/CRM/PCP/Page/PCP.php @@ -234,7 +234,7 @@ class CRM_PCP_Page_PCP extends CRM_Core_Page_Basic { } // get all event pages. pcp campaign start and end dates for event related pcp's use the online registration start and end dates, - // altho if target is contribution page this might not be correct. fixme? dgg + // although if target is contribution page this might not be correct. fixme? dgg $query = "SELECT id, title, start_date, end_date, registration_start_date, registration_end_date FROM civicrm_event WHERE is_template IS NULL OR is_template != 1"; diff --git a/CRM/Price/BAO/PriceFieldValue.php b/CRM/Price/BAO/PriceFieldValue.php index 4c531b4463..3ab2e89ae9 100644 --- a/CRM/Price/BAO/PriceFieldValue.php +++ b/CRM/Price/BAO/PriceFieldValue.php @@ -191,7 +191,7 @@ class CRM_Price_BAO_PriceFieldValue extends CRM_Price_DAO_PriceFieldValue { * Value we want to set the is_active field. * * @return Object - * DAO object on sucess, null otherwise + * DAO object on success, null otherwise * */ public static function setIsActive($id, $is_active) { diff --git a/CRM/Price/BAO/PriceSet.php b/CRM/Price/BAO/PriceSet.php index 41e5054db5..5f0e6cf30b 100644 --- a/CRM/Price/BAO/PriceSet.php +++ b/CRM/Price/BAO/PriceSet.php @@ -100,7 +100,7 @@ class CRM_Price_BAO_PriceSet extends CRM_Price_DAO_PriceSet { * @internal param bool $is_active value we want to set the is_active field * * @return Object - * DAO object on sucess, null otherwise + * DAO object on success, null otherwise */ public static function setIsActive($id, $isActive) { return CRM_Core_DAO::setFieldValue('CRM_Price_DAO_PriceSet', $id, 'is_active', $isActive); @@ -1339,7 +1339,7 @@ GROUP BY mt.member_of_contact_id"; * Value we want to set the is_quick_config field. * * @return Object - * DAO object on sucess, null otherwise + * DAO object on success, null otherwise */ public static function setIsQuickConfig($id, $isQuickConfig) { return CRM_Core_DAO::setFieldValue('CRM_Price_DAO_PriceSet', $id, 'is_quick_config', $isQuickConfig); diff --git a/CRM/Price/Form/DeleteField.php b/CRM/Price/Form/DeleteField.php index dca78ac2c5..ef4cfdc4d4 100644 --- a/CRM/Price/Form/DeleteField.php +++ b/CRM/Price/Form/DeleteField.php @@ -56,7 +56,7 @@ class CRM_Price_Form_DeleteField extends CRM_Core_Form { * Set up variables to build the form. * * @return void - * @acess protected + * @access protected */ public function preProcess() { $this->_fid = $this->get('fid'); diff --git a/CRM/Profile/Form.php b/CRM/Profile/Form.php index 69229b9e6d..3fdb20fafb 100644 --- a/CRM/Profile/Form.php +++ b/CRM/Profile/Form.php @@ -327,7 +327,7 @@ class CRM_Profile_Form extends CRM_Core_Form { $this->_recordId = NULL; $this->set('recordId', NULL); } - //record id is neccessary for _multiRecord view and update/edit action + //record id is necessary for _multiRecord view and update/edit action if (!$this->_recordId && ($this->_multiRecord == CRM_Core_Action::UPDATE || $this->_multiRecord == CRM_Core_Action::DELETE) ) { diff --git a/CRM/Profile/Page/MultipleRecordFieldsListing.php b/CRM/Profile/Page/MultipleRecordFieldsListing.php index 33ccc48ce8..771fe237b3 100644 --- a/CRM/Profile/Page/MultipleRecordFieldsListing.php +++ b/CRM/Profile/Page/MultipleRecordFieldsListing.php @@ -301,7 +301,7 @@ class CRM_Profile_Page_MultipleRecordFieldsListing extends CRM_Core_Page_Basic { if (is_numeric($fieldId)) { $customValue = &$val; if (!empty($dateFields) && array_key_exists($fieldId, $dateFields)) { - // formated date capture value capture + // formatted date capture value capture $dateFieldsVals[$fieldId][$recId] = CRM_Core_BAO_CustomField::getDisplayValue($customValue, $fieldId, $options); //set date and time format diff --git a/CRM/Profile/Selector/Listings.php b/CRM/Profile/Selector/Listings.php index ca87d3e567..8534bd5ec6 100644 --- a/CRM/Profile/Selector/Listings.php +++ b/CRM/Profile/Selector/Listings.php @@ -42,7 +42,7 @@ class CRM_Profile_Selector_Listings extends CRM_Core_Selector_Base implements CRM_Core_Selector_API { /** - * Array of supported links, currenly view and edit + * Array of supported links, currently view and edit * * @var array */ diff --git a/CRM/Queue/Task.php b/CRM/Queue/Task.php index caee6d0076..af3b40fc2d 100644 --- a/CRM/Queue/Task.php +++ b/CRM/Queue/Task.php @@ -26,7 +26,7 @@ */ /** - * A task is an item that can be enqueued and later exectued + * A task is an item that can be enqueued and later executed */ class CRM_Queue_Task { diff --git a/CRM/Report/Form.php b/CRM/Report/Form.php index c13a8a4573..be341c31a5 100644 --- a/CRM/Report/Form.php +++ b/CRM/Report/Form.php @@ -1004,7 +1004,7 @@ class CRM_Report_Form extends CRM_Core_Form { if (!$groupTitle && isset($table['group_title'])) { $groupTitle = $table['group_title']; // Having a group_title is secret code for being a custom group - // which cryptically translates to needing an accordian. + // which cryptically translates to needing an accordion. // here we make that explicit. $colGroups[$tableName]['use_accordian_for_field_selection'] = TRUE; } diff --git a/CRM/Report/Form/ActivitySummary.php b/CRM/Report/Form/ActivitySummary.php index 84ddef1291..25e5d9a46c 100644 --- a/CRM/Report/Form/ActivitySummary.php +++ b/CRM/Report/Form/ActivitySummary.php @@ -210,7 +210,7 @@ class CRM_Report_Form_ActivitySummary extends CRM_Report_Form { $this->_columnHeaders["{$tableName}_{$fieldName}_start"]['type'] = $field['type']; $this->_columnHeaders["{$tableName}_{$fieldName}_start"]['group_by'] = $this->_params['group_bys_freq'][$fieldName]; - // just to make sure these values are transfered to rows. + // just to make sure these values are transferred to rows. // since we need that for calculation purpose, // e.g making subtotals look nicer or graphs $this->_columnHeaders["{$tableName}_{$fieldName}_interval"] = array('no_display' => TRUE); diff --git a/CRM/Report/Form/Contribute/Summary.php b/CRM/Report/Form/Contribute/Summary.php index 3398bdc31d..ca2d80602e 100644 --- a/CRM/Report/Form/Contribute/Summary.php +++ b/CRM/Report/Form/Contribute/Summary.php @@ -318,7 +318,7 @@ class CRM_Report_Form_Contribute_Summary extends CRM_Report_Form { $this->_columnHeaders["{$tableName}_{$fieldName}_start"]['type'] = $field['type']; $this->_columnHeaders["{$tableName}_{$fieldName}_start"]['group_by'] = $this->_params['group_bys_freq'][$fieldName]; - // just to make sure these values are transfered to rows. + // just to make sure these values are transferred to rows. // since we need that for calculation purpose, // e.g making subtotals look nicer or graphs $this->_columnHeaders["{$tableName}_{$fieldName}_interval"] = array('no_display' => TRUE); diff --git a/CRM/Report/Form/Contribute/Sybunt.php b/CRM/Report/Form/Contribute/Sybunt.php index e214895f7b..c692f2da7d 100644 --- a/CRM/Report/Form/Contribute/Sybunt.php +++ b/CRM/Report/Form/Contribute/Sybunt.php @@ -514,17 +514,17 @@ class CRM_Report_Form_Contribute_Sybunt extends CRM_Report_Form { $previous_year = $current_year - 1; $previous_two_year = $current_year - 2; $previous_three_year = $current_year - 3; - $upto = $current_year - 4; + $up to = $current_year - 4; $interval[$previous_year] = $previous_year; $interval[$previous_two_year] = $previous_two_year; $interval[$previous_three_year] = $previous_three_year; - $interval["upto_{$upto}"] = "Up To {$upto}"; + $interval["upto_{$up to}"] = "Up To {$up to}"; foreach ($rows as $key => $row) { - $display["upto_{$upto}"] - = CRM_Utils_Array::value("upto_{$upto}", $display) - + CRM_Utils_Array::value("civicrm_upto_{$upto}", $row); + $display["upto_{$up to}"] + = CRM_Utils_Array::value("upto_{$up to}", $display) + + CRM_Utils_Array::value("civicrm_upto_{$up to}", $row); $display[$previous_year] = CRM_Utils_Array::value($previous_year, $display) + CRM_Utils_Array::value($previous_year, $row); diff --git a/CRM/Report/Form/Mailing/Summary.php b/CRM/Report/Form/Mailing/Summary.php index a6ff9f209f..d53ba5841d 100644 --- a/CRM/Report/Form/Mailing/Summary.php +++ b/CRM/Report/Form/Mailing/Summary.php @@ -477,7 +477,7 @@ class CRM_Report_Form_Mailing_Summary extends CRM_Report_Form { return $errors; } - $criterias = self::getChartCriteria(); + $criteria = self::getChartCriteria(); $isError = TRUE; foreach ($fields['fields'] as $fld => $isActive) { if (in_array($fld, array( @@ -498,8 +498,8 @@ class CRM_Report_Form_Mailing_Summary extends CRM_Report_Form { if ($isError) { $errors['_qf_default'] = ts('For Chart view, please select at least one field from %1 OR %2.', array( - 1 => implode(', ', $criterias['count']), - 2 => implode(', ', $criterias['rate']), + 1 => implode(', ', $criteria['count']), + 2 => implode(', ', $criteria['rate']), )); } @@ -514,7 +514,7 @@ class CRM_Report_Form_Mailing_Summary extends CRM_Report_Form { return; } - $criterias = self::getChartCriteria(); + $criteria = self::getChartCriteria(); $chartInfo = array( 'legend' => ts('Mail Summary'), @@ -528,42 +528,42 @@ class CRM_Report_Form_Mailing_Summary extends CRM_Report_Form { foreach ($rows as $row) { $chartInfo['values'][$row['civicrm_mailing_name']] = array(); if ($plotCount) { - foreach ($criterias['count'] as $criteria => $label) { + foreach ($criteria['count'] as $criteria => $label) { if (isset($row[$criteria])) { $chartInfo['values'][$row['civicrm_mailing_name']][$label] = $row[$criteria]; $chartInfo['tip'][$label] = "{$label} #val#"; $plotRate = FALSE; } - elseif (isset($criterias['count'][$criteria])) { - unset($criterias['count'][$criteria]); + elseif (isset($criteria['count'][$criteria])) { + unset($criteria['count'][$criteria]); } } } if ($plotRate) { - foreach ($criterias['rate'] as $criteria => $label) { + foreach ($criteria['rate'] as $criteria => $label) { if (isset($row[$criteria])) { $chartInfo['values'][$row['civicrm_mailing_name']][$label] = $row[$criteria]; $chartInfo['tip'][$label] = "{$label} #val#"; $plotCount = FALSE; } - elseif (isset($criterias['rate'][$criteria])) { - unset($criterias['rate'][$criteria]); + elseif (isset($criteria['rate'][$criteria])) { + unset($criteria['rate'][$criteria]); } } } } if ($plotCount) { - $criterias = $criterias['count']; + $criteria = $criteria['count']; } else { - $criterias = $criterias['rate']; + $criteria = $criteria['rate']; } - $chartInfo['criteria'] = array_values($criterias); + $chartInfo['criteria'] = array_values($criteria); // dynamically set the graph size - $chartInfo['xSize'] = ((count($rows) * 125) + (count($rows) * count($criterias) * 40)); + $chartInfo['xSize'] = ((count($rows) * 125) + (count($rows) * count($criteria) * 40)); // build the chart. CRM_Utils_OpenFlashChart::buildChart($chartInfo, $this->_params['charts']); diff --git a/CRM/Report/Form/Member/Summary.php b/CRM/Report/Form/Member/Summary.php index 31d4f5f1da..3f89d12985 100644 --- a/CRM/Report/Form/Member/Summary.php +++ b/CRM/Report/Form/Member/Summary.php @@ -245,7 +245,7 @@ class CRM_Report_Form_Member_Summary extends CRM_Report_Form { $this->_columnHeaders["{$tableName}_{$fieldName}_start"]['type'] = $field['type']; $this->_columnHeaders["{$tableName}_{$fieldName}_start"]['group_by'] = $this->_params['group_bys_freq'][$fieldName]; - // just to make sure these values are transfered to rows. + // just to make sure these values are transferred to rows. // since we need that for calculation purpose, // e.g making subtotals look nicer or graphs $this->_columnHeaders["{$tableName}_{$fieldName}_interval"] = array('no_display' => TRUE); diff --git a/CRM/Report/Utils/Report.php b/CRM/Report/Utils/Report.php index d9a86a2a7c..ca511b13b0 100644 --- a/CRM/Report/Utils/Report.php +++ b/CRM/Report/Utils/Report.php @@ -54,7 +54,7 @@ class CRM_Report_Utils_Report { array_shift($args); array_shift($args); - // put rest of arguement back in the form of url, which is how value + // put rest of argument back in the form of url, which is how value // is stored in option value table $optionVal = implode('/', $args); } diff --git a/CRM/Upgrade/Incremental/php/FourOne.php b/CRM/Upgrade/Incremental/php/FourOne.php index ba128c4833..9a8af67921 100644 --- a/CRM/Upgrade/Incremental/php/FourOne.php +++ b/CRM/Upgrade/Incremental/php/FourOne.php @@ -32,7 +32,7 @@ * */ class CRM_Upgrade_Incremental_php_FourOne { - // This was changed in 4.3 so we define it locally for compatability with older dbs + // This was changed in 4.3 so we define it locally for compatibility with older dbs const NAVIGATION_NAME = "Navigation Menu"; /** diff --git a/CRM/Upgrade/Incremental/php/ThreeThree.php b/CRM/Upgrade/Incremental/php/ThreeThree.php index 65c2314a4b..ed46b6c583 100644 --- a/CRM/Upgrade/Incremental/php/ThreeThree.php +++ b/CRM/Upgrade/Incremental/php/ThreeThree.php @@ -248,7 +248,7 @@ WHERE id = %2 CRM_Core_DAO::executeQuery($updatePriceField, array(), TRUE, NULL, FALSE, FALSE); // as the table 'civicrm_price_field' is localised and column 'count' is dropped - // after the views are rebuild, we need to rebuild views to avoid invalid refrence of table. + // after the views are rebuild, we need to rebuild views to avoid invalid reference of table. if ($upgrade->multilingual) { CRM_Core_I18n_Schema::rebuildMultilingualSchema($upgrade->locales, $rev); } diff --git a/CRM/Upgrade/Incremental/sql/4.2.alpha1.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.2.alpha1.mysql.tpl index 74a24fcc77..8f7c319973 100644 --- a/CRM/Upgrade/Incremental/sql/4.2.alpha1.mysql.tpl +++ b/CRM/Upgrade/Incremental/sql/4.2.alpha1.mysql.tpl @@ -109,7 +109,7 @@ INSERT INTO civicrm_navigation ( domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight ) VALUES ( {$domainID}, 'civicrm/batch&reset=1', '{ts escape="sql" skip="true"}Batches{/ts}', 'Batches', 'access CiviContribute,access CiviMember', '', @navContributionsID, '1', NULL, 4 ), - ( {$domainID}, 'civicrm/batch&reset=1', '{ts escape="sql" skip="true"}Batches{/ts}', 'Batches', 'access CiviMember,acess CiviContribute', '', @navMembershipsID, '1', NULL, 4 ); + ( {$domainID}, 'civicrm/batch&reset=1', '{ts escape="sql" skip="true"}Batches{/ts}', 'Batches', 'access CiviMember,access CiviContribute', '', @navMembershipsID, '1', NULL, 4 ); -- CRM-9686 INSERT INTO `civicrm_state_province`(`country_id`, `abbreviation`, `name`) VALUES(1097, "LP", "La Paz"); diff --git a/CRM/Upgrade/Incremental/sql/4.6.0.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.6.0.mysql.tpl index 7102073cc4..2380d47679 100644 --- a/CRM/Upgrade/Incremental/sql/4.6.0.mysql.tpl +++ b/CRM/Upgrade/Incremental/sql/4.6.0.mysql.tpl @@ -40,7 +40,7 @@ WHERE option_group_id = @option_group_id_notePrivacy AND value = 1; ('group_type', 'safe_file_extension', 'wysiwyg_editor'); {/if} ---This one is wierd. What the heck is this anyway? +--This one is weird. What the heck is this anyway? UPDATE civicrm_option_value v, civicrm_option_group g SET v.name = v.value WHERE g.id = v.option_group_id AND g.name = 'redaction_rule'; diff --git a/CRM/Upgrade/Snapshot/V4p2/Price/BAO/Field.php b/CRM/Upgrade/Snapshot/V4p2/Price/BAO/Field.php index 5e1c5391e7..a5b5cfe705 100644 --- a/CRM/Upgrade/Snapshot/V4p2/Price/BAO/Field.php +++ b/CRM/Upgrade/Snapshot/V4p2/Price/BAO/Field.php @@ -176,7 +176,7 @@ class CRM_Upgrade_Snapshot_V4p2_Price_BAO_Field extends CRM_Upgrade_Snapshot_V4p * Value we want to set the is_active field. * * @return Object - * DAO object on sucess, null otherwise + * DAO object on success, null otherwise * */ public static function setIsActive($id, $is_active) { @@ -273,7 +273,7 @@ class CRM_Upgrade_Snapshot_V4p2_Price_BAO_Field extends CRM_Upgrade_Snapshot_V4p $extra = array('onclick' => 'useAmountOther();'); } - // if seperate membership payment is used with quick config priceset then change the other amount label + // if separate membership payment is used with quick config priceset then change the other amount label if (property_exists($qf, '_membershipBlock') && !empty($qf->_membershipBlock['is_separate_payment']) && $qf->_quickConfig && $field->name == 'other_amount' && !property_exists($qf, '_contributionAmount')) { $label = ts('Additional Contribution'); $useRequired = 0; diff --git a/CRM/Upgrade/Snapshot/V4p2/Price/BAO/FieldValue.php b/CRM/Upgrade/Snapshot/V4p2/Price/BAO/FieldValue.php index 5f73c8455b..571695fc2f 100644 --- a/CRM/Upgrade/Snapshot/V4p2/Price/BAO/FieldValue.php +++ b/CRM/Upgrade/Snapshot/V4p2/Price/BAO/FieldValue.php @@ -178,7 +178,7 @@ class CRM_Upgrade_Snapshot_V4p2_Price_BAO_FieldValue extends CRM_Upgrade_Snapsho * Value we want to set the is_active field. * * @return Object - * DAO object on sucess, null otherwise + * DAO object on success, null otherwise * */ public static function setIsActive($id, $is_active) { diff --git a/CRM/Upgrade/Snapshot/V4p2/Price/BAO/Set.php b/CRM/Upgrade/Snapshot/V4p2/Price/BAO/Set.php index 6e48322241..00af68d270 100644 --- a/CRM/Upgrade/Snapshot/V4p2/Price/BAO/Set.php +++ b/CRM/Upgrade/Snapshot/V4p2/Price/BAO/Set.php @@ -86,7 +86,7 @@ class CRM_Upgrade_Snapshot_V4p2_Price_BAO_Set extends CRM_Upgrade_Snapshot_V4p2_ * Value we want to set the is_active field. * * @return Object - * DAO object on sucess, null otherwise + * DAO object on success, null otherwise */ public static function setIsActive($id, $isActive) { return CRM_Core_DAO::setFieldValue('CRM_Upgrade_Snapshot_V4p2_Price_DAO_Set', $id, 'is_active', $isActive); diff --git a/CRM/Utils/Cache.php b/CRM/Utils/Cache.php index 94b2cfb4ee..9f2b2e962a 100644 --- a/CRM/Utils/Cache.php +++ b/CRM/Utils/Cache.php @@ -114,7 +114,7 @@ class CRM_Utils_Cache { 'prefix' => '', ); - // Use old constants if needed to ensure backward compatability + // Use old constants if needed to ensure backward compatibility if (defined('CIVICRM_MEMCACHE_HOST')) { $defaults['host'] = CIVICRM_MEMCACHE_HOST; } diff --git a/CRM/Utils/Date.php b/CRM/Utils/Date.php index f58994f6b3..898045b738 100644 --- a/CRM/Utils/Date.php +++ b/CRM/Utils/Date.php @@ -727,7 +727,7 @@ class CRM_Utils_Date { * format is 2007-12-21 ) * * @return string - * Return the customized todays date (Y-m-d) + * Return the customized today's date (Y-m-d) */ public static function getToday($dayParams = NULL, $format = "Y-m-d") { if (is_null($dayParams) || empty($dayParams)) { diff --git a/CRM/Utils/Hook.php b/CRM/Utils/Hook.php index 915f830943..7da33cda19 100644 --- a/CRM/Utils/Hook.php +++ b/CRM/Utils/Hook.php @@ -1340,7 +1340,7 @@ abstract class CRM_Utils_Hook { * float $x x position in user units * float $y y position in user units * boolean $reseth if true reset the last cell height (default true). - * int $stretch stretch carachter mode: