From ceb10dc7b9eb50fc2bcb0cb62965035b1725a6bb Mon Sep 17 00:00:00 2001 From: "Donald A. Lobo" Date: Mon, 29 Apr 2013 14:44:58 -0700 Subject: [PATCH] CRM-12457 ---------------------------------------- * CRM-12457: Typo - 'Succesful' is spelled 'Successful' http://issues.civicrm.org/jira/browse/CRM-12457 --- CRM/Activity/Import/Form/Summary.php | 2 +- CRM/Activity/Import/Parser/Activity.php | 2 +- CRM/Contribute/Import/Form/Summary.php | 2 +- CRM/Contribute/Import/Parser/Contribution.php | 8 ++++---- CRM/Core/Payment/Elavon.php | 4 ++-- CRM/Core/Payment/FirstData.php | 2 +- CRM/Core/Payment/PayflowPro.php | 16 ++++++++-------- CRM/Core/Payment/eWAY.php | 2 +- CRM/Event/Import/Form/Summary.php | 2 +- CRM/Event/Import/Parser/Participant.php | 4 ++-- CRM/Import/Parser/Contact.php | 8 ++++---- CRM/Mailing/Event/BAO/Unsubscribe.php | 14 +++++++------- CRM/Mailing/Form/Test.php | 4 ++-- CRM/Member/Import/Form/Summary.php | 2 +- CRM/Member/Import/Parser/Membership.php | 4 ++-- 15 files changed, 38 insertions(+), 38 deletions(-) diff --git a/CRM/Activity/Import/Form/Summary.php b/CRM/Activity/Import/Form/Summary.php index 38b9ca5f29..c8f8d3847f 100644 --- a/CRM/Activity/Import/Form/Summary.php +++ b/CRM/Activity/Import/Form/Summary.php @@ -87,7 +87,7 @@ class CRM_Activity_Import_Form_Summary extends CRM_Core_Form { $this->assign('dupeError', TRUE); - /* only subtract dupes from succesful import if we're skipping */ + /* only subtract dupes from successful import if we're skipping */ $this->set('validRowCount', $totalRowCount - $invalidRowCount - $conflictRowCount - $duplicateRowCount - $mismatchCount diff --git a/CRM/Activity/Import/Parser/Activity.php b/CRM/Activity/Import/Parser/Activity.php index 1bffc07834..d3f06339a8 100644 --- a/CRM/Activity/Import/Parser/Activity.php +++ b/CRM/Activity/Import/Parser/Activity.php @@ -48,7 +48,7 @@ class CRM_Activity_Import_Parser_Activity extends CRM_Activity_Import_Parser { private $_activityDateIndex; /** - * Array of succesfully imported activity id's + * Array of successfully imported activity id's * * @array */ diff --git a/CRM/Contribute/Import/Form/Summary.php b/CRM/Contribute/Import/Form/Summary.php index 982289593f..2d9829281a 100644 --- a/CRM/Contribute/Import/Form/Summary.php +++ b/CRM/Contribute/Import/Form/Summary.php @@ -98,7 +98,7 @@ class CRM_Contribute_Import_Form_Summary extends CRM_Core_Form { $this->assign('dupeError', TRUE); - /* only subtract dupes from succesful import if we're skipping */ + /* only subtract dupes from successfyul import if we're skipping */ $this->set('validRowCount', $totalRowCount - $invalidRowCount - $conflictRowCount - $duplicateRowCount - $mismatchCount - $invalidSoftCreditRowCount - $invalidPledgePaymentRowCount diff --git a/CRM/Contribute/Import/Parser/Contribution.php b/CRM/Contribute/Import/Parser/Contribution.php index 64bcb9e297..3de0470e79 100644 --- a/CRM/Contribute/Import/Parser/Contribution.php +++ b/CRM/Contribute/Import/Parser/Contribution.php @@ -48,7 +48,7 @@ class CRM_Contribute_Import_Parser_Contribution extends CRM_Contribute_Import_Pa //protected $_mapperPhoneType; /** - * Array of succesfully imported contribution id's + * Array of successfully imported contribution id's * * @array */ @@ -183,7 +183,7 @@ class CRM_Contribute_Import_Parser_Contribution extends CRM_Contribute_Import_Pa case 'cancel_date': if ($dateValue = CRM_Utils_Date::formatDate($params[$key], $dateType)) { - $params[$key] = $dateValue; + $params[$key] = $dateValue; } else { CRM_Import_Parser_Contact::addToErrorMsg('Cancel Date', $errorMessage); @@ -394,7 +394,7 @@ class CRM_Contribute_Import_Parser_Contribution extends CRM_Contribute_Import_Pa } $newContribution = CRM_Contribute_BAO_Contribution::create($formatted, $ids); - + $this->_newContributions[] = $newContribution->id; //return soft valid since we need to show how soft credits were added @@ -573,7 +573,7 @@ class CRM_Contribute_Import_Parser_Contribution extends CRM_Contribute_Import_Pa } /** - * Get the array of succesfully imported contribution id's + * Get the array of successfully imported contribution id's * * @return array * @access public diff --git a/CRM/Core/Payment/Elavon.php b/CRM/Core/Payment/Elavon.php index 9bd0105e46..19fa8c997f 100644 --- a/CRM/Core/Payment/Elavon.php +++ b/CRM/Core/Payment/Elavon.php @@ -104,7 +104,7 @@ class CRM_Core_Payment_Elavon extends CRM_Core_Payment { // 32 character string $requestFields['ssl_invoice_number'] = $params['invoiceID']; $requestFields['ssl_transaction_type'] = "CCSALE"; - $requestFields['ssl_description'] = empty($params['description']) ? "backoffice payment" : $params['description']; + $requestFields['ssl_description'] = empty($params['description']) ? "backoffice payment" : $params['description']; $requestFields['ssl_customer_number'] = substr($params['credit_card_number'], -4); /************************************************************************************ @@ -246,7 +246,7 @@ class CRM_Core_Payment_Elavon extends CRM_Core_Payment { curl_close($ch); /********************************************************** - * Payment succesfully sent to gateway - process the response now + * Payment successfully sent to gateway - process the response now **********************************************************/ $processorResponse = self::decodeXMLResponse($responseData); diff --git a/CRM/Core/Payment/FirstData.php b/CRM/Core/Payment/FirstData.php index 140b5b8963..950f159b06 100644 --- a/CRM/Core/Payment/FirstData.php +++ b/CRM/Core/Payment/FirstData.php @@ -275,7 +275,7 @@ class CRM_Core_Payment_FirstData extends CRM_Core_Payment { curl_close($ch); //---------------------------------------------------------------------------------------------------- - // Payment succesfully sent to gateway - process the response now + // Payment successfully sent to gateway - process the response now //---------------------------------------------------------------------------------------------------- // $processorResponse = lphp::decodeXML($responseData); diff --git a/CRM/Core/Payment/PayflowPro.php b/CRM/Core/Payment/PayflowPro.php index 174300a269..5104ffc18f 100644 --- a/CRM/Core/Payment/PayflowPro.php +++ b/CRM/Core/Payment/PayflowPro.php @@ -35,7 +35,7 @@ class CRM_Core_Payment_PayflowPro extends CRM_Core_Payment { $this->_paymentProcessor = $paymentProcessor; $this->_processorName = ts('Payflow Pro'); } - + /** * singleton function used to manage this object * @@ -66,7 +66,7 @@ class CRM_Core_Payment_PayflowPro extends CRM_Core_Payment { /* * define variables for connecting with the gateway */ - + // Are you using the Payflow Fraud Protection Service? // Default is YES, change to NO or blank if not. //This has not been investigated as part of writing this payment processor @@ -272,7 +272,7 @@ class CRM_Core_Payment_PayflowPro extends CRM_Core_Payment { $responseData = self::submit_transaction($submiturl, $payflow_query); /* - * Payment succesfully sent to gateway - process the response now + * Payment successfully sent to gateway - process the response now */ $result = strstr($responseData, "RESULT"); $nvpArray = array(); @@ -395,7 +395,7 @@ class CRM_Core_Payment_PayflowPro extends CRM_Core_Payment { * returns string $errorMsg if any errors found - null if OK * */ - + // function checkConfig( $mode ) // CiviCRM V1.9 Declaration // CiviCRM V2.0 Declaration @@ -440,7 +440,7 @@ class CRM_Core_Payment_PayflowPro extends CRM_Core_Payment { /* * Submit transaction using CuRL */ - + // get data ready for API $user_agent = $_SERVER['HTTP_USER_AGENT']; // Here's your custom headers; adjust appropriately for your setup: @@ -582,7 +582,7 @@ class CRM_Core_Payment_PayflowPro extends CRM_Core_Payment { /* * define variables for connecting with the gateway */ - + //if you have not set up a separate user account the vendor name is used as the username if (!$this->_paymentProcessor['subject']) { $user = $this->_paymentProcessor['user_name']; @@ -623,9 +623,9 @@ class CRM_Core_Payment_PayflowPro extends CRM_Core_Payment { //ie. url at payment processor to submit to. $responseData = self::submit_transaction($submiturl, $payflow_query); /* - * Payment succesfully sent to gateway - process the response now + * Payment successfully sent to gateway - process the response now */ - + $result = strstr($responseData, "RESULT"); $nvpArray = array(); while (strlen($result)) { diff --git a/CRM/Core/Payment/eWAY.php b/CRM/Core/Payment/eWAY.php index 0bb683548d..e33652ccf3 100644 --- a/CRM/Core/Payment/eWAY.php +++ b/CRM/Core/Payment/eWAY.php @@ -344,7 +344,7 @@ class CRM_Core_Payment_eWAY extends CRM_Core_Payment { curl_close($submit); //---------------------------------------------------------------------------------------------------- - // Payment succesfully sent to gateway - process the response now + // Payment successfully sent to gateway - process the response now //---------------------------------------------------------------------------------------------------- $eWAYResponse->ProcessResponse($responseData); diff --git a/CRM/Event/Import/Form/Summary.php b/CRM/Event/Import/Form/Summary.php index a3ae8db679..66754e6cf3 100644 --- a/CRM/Event/Import/Form/Summary.php +++ b/CRM/Event/Import/Form/Summary.php @@ -86,7 +86,7 @@ class CRM_Event_Import_Form_Summary extends CRM_Core_Form { $this->assign('dupeError', TRUE); - /* only subtract dupes from succesful import if we're skipping */ + /* only subtract dupes from successful import if we're skipping */ $this->set('validRowCount', $totalRowCount - $invalidRowCount - $conflictRowCount - $duplicateRowCount - $mismatchCount diff --git a/CRM/Event/Import/Parser/Participant.php b/CRM/Event/Import/Parser/Participant.php index 5e526489c9..477f7ca9c9 100644 --- a/CRM/Event/Import/Parser/Participant.php +++ b/CRM/Event/Import/Parser/Participant.php @@ -51,7 +51,7 @@ class CRM_Event_Import_Parser_Participant extends CRM_Event_Import_Parser { private $_eventTitleIndex; /** - * Array of succesfully imported participants id's + * Array of successfully imported participants id's * * @array */ @@ -486,7 +486,7 @@ class CRM_Event_Import_Parser_Participant extends CRM_Event_Import_Parser { } /** - * Get the array of succesfully imported Participation ids + * Get the array of successfully imported Participation ids * * @return array * @access public diff --git a/CRM/Import/Parser/Contact.php b/CRM/Import/Parser/Contact.php index b703f95e21..fc540a9444 100644 --- a/CRM/Import/Parser/Contact.php +++ b/CRM/Import/Parser/Contact.php @@ -72,7 +72,7 @@ class CRM_Import_Parser_Contact extends CRM_Import_Parser { protected $_parseStreetAddress; /** - * Array of succesfully imported contact id's + * Array of successfully imported contact id's * * @array */ @@ -86,7 +86,7 @@ class CRM_Import_Parser_Contact extends CRM_Import_Parser { protected $_lineCount; /** - * Array of succesfully imported related contact id's + * Array of successfully imported related contact id's * * @array */ @@ -1084,7 +1084,7 @@ class CRM_Import_Parser_Contact extends CRM_Import_Parser { } /** - * Get the array of succesfully imported contact id's + * Get the array of successfully imported contact id's * * @return array * @access public @@ -1094,7 +1094,7 @@ class CRM_Import_Parser_Contact extends CRM_Import_Parser { } /** - * Get the array of succesfully imported related contact id's + * Get the array of successfully imported related contact id's * * @return array * @access public diff --git a/CRM/Mailing/Event/BAO/Unsubscribe.php b/CRM/Mailing/Event/BAO/Unsubscribe.php index 3a41028533..1910ab37a2 100644 --- a/CRM/Mailing/Event/BAO/Unsubscribe.php +++ b/CRM/Mailing/Event/BAO/Unsubscribe.php @@ -50,7 +50,7 @@ class CRM_Mailing_Event_BAO_Unsubscribe extends CRM_Mailing_Event_DAO_Unsubscrib * @param int $queue_id The Queue Event ID of the recipient * @param string $hash The hash * - * @return boolean Was the contact succesfully unsubscribed? + * @return boolean Was the contact successfully unsubscribed? * @access public * @static */ @@ -143,8 +143,8 @@ WHERE email = %2 $gc = $gcObject->getTableName(); //We Need the mailing Id for the hook... - $do->query("SELECT $job.mailing_id as mailing_id - FROM $job + $do->query("SELECT $job.mailing_id as mailing_id + FROM $job WHERE $job.id = " . CRM_Utils_Type::escape($job_id, 'Integer')); $do->fetch(); $mailing_id = $do->mailing_id; @@ -159,11 +159,11 @@ WHERE email = %2 INNER JOIN $group ON $mg.entity_id = $group.id WHERE $job.id = " . CRM_Utils_Type::escape($job_id, 'Integer') . " - AND $mg.group_type IN ('Include', 'Base') + AND $mg.group_type IN ('Include', 'Base') AND $group.is_hidden = 0" ); - /* Make a list of groups and a list of prior mailings that received + /* Make a list of groups and a list of prior mailings that received * this mailing */ @@ -310,9 +310,9 @@ WHERE email = %2 list($domainEmailName, $domainEmailAddress) = CRM_Core_BAO_Domain::getNameAndEmail(); $dao = new CRM_Mailing_BAO_Mailing(); - $dao->query(" SELECT * FROM $mailingTable + $dao->query(" SELECT * FROM $mailingTable INNER JOIN $jobTable ON - $jobTable.mailing_id = $mailingTable.id + $jobTable.mailing_id = $mailingTable.id WHERE $jobTable.id = $job"); $dao->fetch(); diff --git a/CRM/Mailing/Form/Test.php b/CRM/Mailing/Form/Test.php index 664ecfaceb..b6d47159cc 100644 --- a/CRM/Mailing/Form/Test.php +++ b/CRM/Mailing/Form/Test.php @@ -176,7 +176,7 @@ class CRM_Mailing_Form_Test extends CRM_Core_Form { * @param array $files Any files posted to the form * @param array $self an current this object * - * @return boolean true on succesful SMTP handoff + * @return boolean true on successful SMTP handoff * @access public */ static function testMail($testParams, $files, $self) { @@ -260,7 +260,7 @@ class CRM_Mailing_Form_Test extends CRM_Core_Form { } } - if (CRM_Utils_Array::value('_qf_Test_next', $testParams) && + if (CRM_Utils_Array::value('_qf_Test_next', $testParams) && $self->get('count') <= 0) { return array( '_qf_default' => diff --git a/CRM/Member/Import/Form/Summary.php b/CRM/Member/Import/Form/Summary.php index e2f552adea..095d4ea3f4 100644 --- a/CRM/Member/Import/Form/Summary.php +++ b/CRM/Member/Import/Form/Summary.php @@ -87,7 +87,7 @@ class CRM_Member_Import_Form_Summary extends CRM_Core_Form { $this->assign('dupeError', TRUE); - /* only subtract dupes from succesful import if we're skipping */ + /* only subtract dupes from successful import if we're skipping */ $this->set('validRowCount', $totalRowCount - $invalidRowCount - $conflictRowCount - $duplicateRowCount - $mismatchCount diff --git a/CRM/Member/Import/Parser/Membership.php b/CRM/Member/Import/Parser/Membership.php index 0c8215947d..46310eed01 100644 --- a/CRM/Member/Import/Parser/Membership.php +++ b/CRM/Member/Import/Parser/Membership.php @@ -49,7 +49,7 @@ class CRM_Member_Import_Parser_Membership extends CRM_Member_Import_Parser { private $_membershipStatusIndex; /** - * Array of succesfully imported membership id's + * Array of successfully imported membership id's * * @array */ @@ -588,7 +588,7 @@ class CRM_Member_Import_Parser_Membership extends CRM_Member_Import_Parser { } /** - * Get the array of succesfully imported membership id's + * Get the array of successfully imported membership id's * * @return array * @access public -- 2.25.1