From 2efcf0c212127e3281834edf26b64d2bbd5e0bb5 Mon Sep 17 00:00:00 2001 From: eileen Date: Mon, 15 Jul 2013 11:26:48 +1200 Subject: [PATCH] remove newly introduced trailing spaces & tabs, new windows line-breaks also present but not tackled --- CRM/Admin/Form/Setting.php | 2 +- CRM/Campaign/Form/Petition/Signature.php | 12 ++--- CRM/Contact/BAO/Contact.php | 2 +- CRM/Contact/BAO/Contact/Permission.php | 24 +++++----- CRM/Contact/BAO/Query/Hook.php | 8 ++-- CRM/Contact/Form/RelatedContact.php | 2 +- CRM/Contact/Form/Task/Delete.php | 2 +- CRM/Core/BAO/ConfigSetting.php | 6 +-- CRM/Core/Config/Variables.php | 4 +- CRM/Core/Permission.php | 2 +- CRM/Core/Permission/WordPress.php | 2 +- CRM/Custom/Form/Group.php | 2 +- CRM/Financial/BAO/FinancialItem.php | 10 ++--- CRM/Financial/BAO/FinancialTypeAccount.php | 2 +- CRM/Logging/ReportSummary.php | 4 +- CRM/PCP/Form/PCPAccount.php | 2 +- CRM/Pledge/BAO/PledgePayment.php | 6 +-- CRM/Profile/Form/Edit.php | 2 +- CRM/Report/BAO/ReportInstance.php | 6 +-- CRM/Report/Form/Member/Detail.php | 2 +- .../event_offline_receipt_html.tpl | 22 +++++----- .../event_offline_receipt_text.tpl | 4 +- .../event_online_receipt_html.tpl | 44 +++++++++---------- .../event_online_receipt_text.tpl | 6 +-- CRM/Upgrade/Incremental/php/FourThree.php | 4 +- CRM/Utils/Hook.php | 6 +-- CRM/Utils/System/Joomla.php | 2 +- css/Audit/style.css | 2 +- css/civicrm.css | 2 +- js/jquery/jquery.crmasmselect.js | 13 +++--- js/jquery/jquery.crmeditable.js | 6 +-- templates/CRM/Admin/Page/PaymentProcessor.hlp | 6 +-- .../CRM/Contact/BAO/QueryTestDataProvider.php | 2 +- .../BAO/FinancialTypeAccountTest.php | 2 +- .../CRM/Report/Form/Contribute/DetailTest.php | 6 +-- tests/templates/documentFunction.tpl | 2 +- 36 files changed, 116 insertions(+), 115 deletions(-) diff --git a/CRM/Admin/Form/Setting.php b/CRM/Admin/Form/Setting.php index 6d65cad901..9fbe3747c6 100644 --- a/CRM/Admin/Form/Setting.php +++ b/CRM/Admin/Form/Setting.php @@ -219,7 +219,7 @@ LIMIT 1 unset($params['autocompleteContactReference']); } - // save components to be enabled + // save components to be enabled if (CRM_Utils_Array::value('enableComponents', $params)) { CRM_Core_BAO_Setting::setItem($params['enableComponents'], CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME,'enable_components'); diff --git a/CRM/Campaign/Form/Petition/Signature.php b/CRM/Campaign/Form/Petition/Signature.php index 2bfe2cd12a..b00282c63e 100644 --- a/CRM/Campaign/Form/Petition/Signature.php +++ b/CRM/Campaign/Form/Petition/Signature.php @@ -283,7 +283,7 @@ class CRM_Campaign_Form_Petition_Signature extends CRM_Core_Form { } $this->setDefaults($this->_defaults); - + // add in all state country selectors for enabled countries CRM_Core_BAO_Address::fixAllStateSelects($this, $this->_defaults); } @@ -587,7 +587,7 @@ class CRM_Campaign_Form_Petition_Signature extends CRM_Core_Form { */ function buildCustom($id, $name, $viewOnly = FALSE) { - // create state country map array to hold selectors + // create state country map array to hold selectors $stateCountryMap = array(); if ($id) { @@ -630,15 +630,15 @@ class CRM_Campaign_Form_Petition_Signature extends CRM_Core_Form { // ignore file upload fields continue; } - - // if state or country in the profile, create map + + // if state or country in the profile, create map list($prefixName, $index) = CRM_Utils_System::explode('-', $key, 2); if ($prefixName == 'state_province' || $prefixName == 'country' || $prefixName == 'county') { if (!array_key_exists($index, $stateCountryMap)) { $stateCountryMap[$index] = array(); } $stateCountryMap[$index][$prefixName] = $key; - } + } CRM_Core_BAO_UFGroup::buildProfile($this, $field, CRM_Profile_Form::MODE_CREATE, $contactID, TRUE); $this->_fields[$key] = $field; @@ -647,7 +647,7 @@ class CRM_Campaign_Form_Petition_Signature extends CRM_Core_Form { } } - // initialize the state country map + // initialize the state country map CRM_Core_BAO_Address::addStateCountryMap($stateCountryMap); if ($addCaptcha && diff --git a/CRM/Contact/BAO/Contact.php b/CRM/Contact/BAO/Contact.php index 27133f3173..dcff832d7e 100644 --- a/CRM/Contact/BAO/Contact.php +++ b/CRM/Contact/BAO/Contact.php @@ -723,7 +723,7 @@ WHERE civicrm_contact.id = " . CRM_Utils_Type::escape($id, 'Integer'); ) { return FALSE; } - + // CRM-12929 // Restrict contact to be delete if contact has financial trxns $error = NULL; diff --git a/CRM/Contact/BAO/Contact/Permission.php b/CRM/Contact/BAO/Contact/Permission.php index 424833e63d..4b4cce81c3 100644 --- a/CRM/Contact/BAO/Contact/Permission.php +++ b/CRM/Contact/BAO/Contact/Permission.php @@ -280,27 +280,27 @@ LEFT JOIN civicrm_relationship seconddegbb and seconddegbb.is_permission_a_b = 1 and firstdeg.is_permission_a_b = 1 and seconddegbb.is_active = 1 -WHERE +WHERE ( - ( firstdeg.contact_id_a = %1 AND firstdeg.contact_id_b = %2 AND firstdeg.is_permission_a_b = 1 ) + ( firstdeg.contact_id_a = %1 AND firstdeg.contact_id_b = %2 AND firstdeg.is_permission_a_b = 1 ) OR ( firstdeg.contact_id_a = %2 AND firstdeg.contact_id_b = %1 AND firstdeg.is_permission_b_a = 1 ) - OR ( + OR ( firstdeg.contact_id_a = %1 AND seconddegba.contact_id_a = %2 - AND (seconddegba.contact_id_a NOT IN (SELECT id FROM civicrm_contact WHERE is_deleted = 1)) + AND (seconddegba.contact_id_a NOT IN (SELECT id FROM civicrm_contact WHERE is_deleted = 1)) ) - OR ( + OR ( firstdeg.contact_id_a = %1 AND seconddegbb.contact_id_b = %2 - AND (seconddegbb.contact_id_b NOT IN (SELECT id FROM civicrm_contact WHERE is_deleted = 1)) + AND (seconddegbb.contact_id_b NOT IN (SELECT id FROM civicrm_contact WHERE is_deleted = 1)) ) - OR ( + OR ( firstdeg.contact_id_b = %1 AND seconddegab.contact_id_b = %2 - AND (seconddegab.contact_id_b NOT IN (SELECT id FROM civicrm_contact WHERE is_deleted = 1)) + AND (seconddegab.contact_id_b NOT IN (SELECT id FROM civicrm_contact WHERE is_deleted = 1)) ) - OR ( - firstdeg.contact_id_b = %1 AND seconddegaa.contact_id_a = %2 AND (seconddegaa.contact_id_a NOT IN (SELECT id FROM civicrm_contact WHERE is_deleted = 1)) + OR ( + firstdeg.contact_id_b = %1 AND seconddegaa.contact_id_a = %2 AND (seconddegaa.contact_id_a NOT IN (SELECT id FROM civicrm_contact WHERE is_deleted = 1)) ) - ) - AND (firstdeg.contact_id_a NOT IN (SELECT id FROM civicrm_contact WHERE is_deleted = 1)) + ) + AND (firstdeg.contact_id_a NOT IN (SELECT id FROM civicrm_contact WHERE is_deleted = 1)) AND (firstdeg.contact_id_b NOT IN (SELECT id FROM civicrm_contact WHERE is_deleted = 1)) AND ( firstdeg.is_active = 1) "; diff --git a/CRM/Contact/BAO/Query/Hook.php b/CRM/Contact/BAO/Query/Hook.php index 6f3ecefc75..3fb9087f95 100644 --- a/CRM/Contact/BAO/Query/Hook.php +++ b/CRM/Contact/BAO/Query/Hook.php @@ -37,7 +37,7 @@ * Delegate query functions based on hook system */ class CRM_Contact_BAO_Query_Hook { - + /** * @var array of CRM_Contact_BAO_Query_Interface objects */ @@ -70,7 +70,7 @@ class CRM_Contact_BAO_Query_Hook { } return $this->_queryObjects; } - + public function &getFields() { $extFields = array(); foreach (self::getSearchQueryObjects() as $obj) { @@ -79,13 +79,13 @@ class CRM_Contact_BAO_Query_Hook { } return $extFields; } - + public function alterSearchQuery(&$query, $fnName) { foreach (self::getSearchQueryObjects() as $obj) { $obj->$fnName($query); } } - + public function buildSearchfrom($fieldName, $mode, $side) { $from = ''; foreach (self::getSearchQueryObjects() as $obj) { diff --git a/CRM/Contact/Form/RelatedContact.php b/CRM/Contact/Form/RelatedContact.php index 2fc33c31a6..4ed894d1f4 100644 --- a/CRM/Contact/Form/RelatedContact.php +++ b/CRM/Contact/Form/RelatedContact.php @@ -134,7 +134,7 @@ class CRM_Contact_Form_RelatedContact extends CRM_Core_Form { ); $stateID = CRM_Utils_Array::value('state_province_id', $this->_defaults['address'][1] - ); + ); } CRM_Contact_BAO_Contact_Utils::buildOnBehalfForm($this, $this->_contactType, diff --git a/CRM/Contact/Form/Task/Delete.php b/CRM/Contact/Form/Task/Delete.php index d9aa493540..3f43c1c0aa 100644 --- a/CRM/Contact/Form/Task/Delete.php +++ b/CRM/Contact/Form/Task/Delete.php @@ -169,7 +169,7 @@ class CRM_Contact_Form_Task_Delete extends CRM_Contact_Form_Task { else { $this->addDefaultButtons($label, 'done'); } - + $this->addFormRule(array('CRM_Contact_Form_Task_Delete', 'formRule'), $this); } diff --git a/CRM/Core/BAO/ConfigSetting.php b/CRM/Core/BAO/ConfigSetting.php index 95933fba60..7864add6b3 100644 --- a/CRM/Core/BAO/ConfigSetting.php +++ b/CRM/Core/BAO/ConfigSetting.php @@ -353,11 +353,11 @@ class CRM_Core_BAO_ConfigSetting { // retrieve directory and url preferences also CRM_Core_BAO_Setting::retrieveDirectoryAndURLPreferences($defaults); - // Pickup enabled-components from settings table if found. + // Pickup enabled-components from settings table if found. $enableComponents = CRM_Core_BAO_Setting::getItem(CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME, 'enable_components', NULL, array()); if (!empty($enableComponents)) { $defaults['enableComponents'] = $enableComponents; - + $components = CRM_Core_Component::getComponents(); $enabledComponentIDs = array(); foreach ($defaults['enableComponents'] as $name) { @@ -627,7 +627,7 @@ WHERE option_group_id = ( } // get enabled-components from DB and add to the list - $enabledComponents = + $enabledComponents = CRM_Core_BAO_Setting::getItem(CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME, 'enable_components', NULL, array()); $enabledComponents[] = $componentName; diff --git a/CRM/Core/Config/Variables.php b/CRM/Core/Config/Variables.php index 469ff3d6b4..ee44cbdb66 100644 --- a/CRM/Core/Config/Variables.php +++ b/CRM/Core/Config/Variables.php @@ -452,12 +452,12 @@ class CRM_Core_Config_Variables extends CRM_Core_Config_Defaults { * Path to wkhtmltopdf if available */ public $wkhtmltopdfPath = FALSE; - + /** * Allow second-degree relations permission to edit contacts */ public $secondDegRelPermissions = FALSE; - + /** * Allow second-degree relations permission to edit contacts diff --git a/CRM/Core/Permission.php b/CRM/Core/Permission.php index 6ca3f84fe9..52cc6f041a 100644 --- a/CRM/Core/Permission.php +++ b/CRM/Core/Permission.php @@ -280,7 +280,7 @@ class CRM_Core_Permission { return $permissionedEvents; } if (!empty($permissionedEvents)){ - return array_search($eventID, $permissionedEvents) === FALSE ? NULL : $eventID; + return array_search($eventID, $permissionedEvents) === FALSE ? NULL : $eventID; } else { return $eventID; } diff --git a/CRM/Core/Permission/WordPress.php b/CRM/Core/Permission/WordPress.php index e2f5947b2e..d65427466a 100644 --- a/CRM/Core/Permission/WordPress.php +++ b/CRM/Core/Permission/WordPress.php @@ -46,7 +46,7 @@ class CRM_Core_Permission_WordPress extends CRM_Core_Permission_Base { * @access public */ function check($str) { - // Generic cms 'administer users' role tranlates to 'administrator' WordPress role + // Generic cms 'administer users' role tranlates to 'administrator' WordPress role $str = $this->translatePermission($str, 'WordPress', array( 'administer users' => 'administrator', )); diff --git a/CRM/Custom/Form/Group.php b/CRM/Custom/Form/Group.php index 48c3c2133c..0e144dadb7 100644 --- a/CRM/Custom/Form/Group.php +++ b/CRM/Custom/Form/Group.php @@ -523,7 +523,7 @@ class CRM_Custom_Form_Group extends CRM_Core_Form { /* * Function to return a formatted list of relationship name. * @param $list array array of relationship name. - * @static + * @static * return array array of relationship name. */ static function getFormattedList(&$list) { diff --git a/CRM/Financial/BAO/FinancialItem.php b/CRM/Financial/BAO/FinancialItem.php index 44b508ac98..3df83df8ed 100644 --- a/CRM/Financial/BAO/FinancialItem.php +++ b/CRM/Financial/BAO/FinancialItem.php @@ -203,7 +203,7 @@ class CRM_Financial_BAO_FinancialItem extends CRM_Financial_DAO_FinancialItem { return null; } } - + /** * check if contact is present in financial_item table * @@ -221,7 +221,7 @@ class CRM_Financial_BAO_FinancialItem extends CRM_Financial_DAO_FinancialItem { if (empty($contactIds)) { return FALSE; } - + $allowPermDelete = CRM_Core_BAO_Setting::getItem(CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME, 'allowPermDeleteFinancial'); if (!$allowPermDelete) { @@ -234,14 +234,14 @@ WHERE cc.id IN (' . implode (',', $contactIds) . ') AND con.is_test = 0'; $url = CRM_Utils_System::url('civicrm/contact/view', "reset=1&cid=$dao->id"); $not_deleted[$dao->id] = "$dao->display_name"; } - + $errorStatus = ''; if (is_array($error)) { $errorStatus = ''; } - + $error['_qf_default'] = $errorStatus . ts('This contact(s) can not be permanently deleted because the contact record is linked to one or more live financial transactions. Deleting this contact would result in the loss of financial data.'); - return $error; + return $error; } } return FALSE; diff --git a/CRM/Financial/BAO/FinancialTypeAccount.php b/CRM/Financial/BAO/FinancialTypeAccount.php index 834c3cc1c6..68df112f79 100644 --- a/CRM/Financial/BAO/FinancialTypeAccount.php +++ b/CRM/Financial/BAO/FinancialTypeAccount.php @@ -137,7 +137,7 @@ class CRM_Financial_BAO_FinancialTypeAccount extends CRM_Financial_DAO_EntityFin break; } } - + if ($check) { if ($name[1] == 'PremiumsProduct' || $name[1] == 'Product') { CRM_Core_Session::setStatus(ts('You cannot remove an account with a %1 relationship while the Financial Type is used for a Premium.', array(1 => $relationValues[$financialTypeAccountId]))); diff --git a/CRM/Logging/ReportSummary.php b/CRM/Logging/ReportSummary.php index 9d0677e106..452c26f8a1 100644 --- a/CRM/Logging/ReportSummary.php +++ b/CRM/Logging/ReportSummary.php @@ -217,7 +217,7 @@ class CRM_Logging_ReportSummary extends CRM_Report_Form { $replaceWith = array(); while($dao->fetch()){ $type = $this->getLogType($dao->log_type); - if (!array_key_exists($type,$replaceWith)) + if (!array_key_exists($type,$replaceWith)) $replaceWith[$type] = array(); $replaceWith[$type][] = $dao->log_type; } @@ -226,7 +226,7 @@ class CRM_Logging_ReportSummary extends CRM_Report_Form { $replaceWith[$type] = implode("','", $tables); } } - + $sql = "ALTER TABLE civicrm_temp_civireport_logsummary ADD COLUMN log_civicrm_entity_log_type_label varchar(64)"; CRM_Core_DAO::executeQuery($sql); foreach ($replaceWith as $type => $in) { diff --git a/CRM/PCP/Form/PCPAccount.php b/CRM/PCP/Form/PCPAccount.php index 81acc9083c..8f1be03544 100644 --- a/CRM/PCP/Form/PCPAccount.php +++ b/CRM/PCP/Form/PCPAccount.php @@ -112,7 +112,7 @@ class CRM_PCP_Form_PCPAccount extends CRM_Core_Form { foreach ($this->_fields as $name => $dontcare) { $fields[$name] = 1; } - + CRM_Core_BAO_UFGroup::setProfileDefaults($this->_contactID, $fields, $this->_defaults); } $stateCountryMap = array(); diff --git a/CRM/Pledge/BAO/PledgePayment.php b/CRM/Pledge/BAO/PledgePayment.php index 299c3b342e..73bffd2c75 100644 --- a/CRM/Pledge/BAO/PledgePayment.php +++ b/CRM/Pledge/BAO/PledgePayment.php @@ -719,7 +719,7 @@ WHERE civicrm_pledge_payment.contribution_id = {$paymentContributionId} while ($paymentsAffected->fetch()) { $paymentIDs[] = $paymentsAffected->id; } - // Reset the affected values by the amount paid more than the scheduled amount + // Reset the affected values by the amount paid more than the scheduled amount foreach($paymentIDs as $key => $value) { $payment = new CRM_Pledge_DAO_PledgePayment(); $payment->id = $value; @@ -733,11 +733,11 @@ WHERE civicrm_pledge_payment.contribution_id = {$paymentContributionId} $payment->save(); } } - + //Cancel the initial paid amount CRM_Core_DAO::setFieldValue('CRM_Pledge_DAO_PledgePayment', reset($paymentIDs), 'status_id', $paymentStatusID, 'id'); CRM_Core_DAO::setFieldValue('CRM_Pledge_DAO_PledgePayment', reset($paymentIDs), 'actual_amount', $actualAmount, 'id'); - + //Add new payment after the last payment for the pledge $allPayments = self::getPledgePayments($pledgeID); $lastPayment = array_pop($allPayments); diff --git a/CRM/Profile/Form/Edit.php b/CRM/Profile/Form/Edit.php index 2c13ae4c60..5de91aab3d 100644 --- a/CRM/Profile/Form/Edit.php +++ b/CRM/Profile/Form/Edit.php @@ -218,7 +218,7 @@ SELECT module $popupRedirect = CRM_Utils_System::url('civicrm/profile/edit', $urlParams, FALSE, NULL, FALSE); } elseif ($this->_onPopupClose == 'redirectToTab') { - $popupRedirect = CRM_Utils_System::url('civicrm/contact/view', + $popupRedirect = CRM_Utils_System::url('civicrm/contact/view', "reset=1&cid={$this->_id}&selectedChild=custom_{$this->_customGroupId}", FALSE, NULL, FALSE); } diff --git a/CRM/Report/BAO/ReportInstance.php b/CRM/Report/BAO/ReportInstance.php index c584778584..9f82c4d1da 100644 --- a/CRM/Report/BAO/ReportInstance.php +++ b/CRM/Report/BAO/ReportInstance.php @@ -107,7 +107,7 @@ class CRM_Report_BAO_ReportInstance extends CRM_Report_DAO_ReportInstance { $instance->report_id = CRM_Report_Utils_Report::getValueFromUrl(); } $instance->save(); - + if ($instanceID) { CRM_Utils_Hook::pre('edit', 'ReportInstance', $instance->id, $instance); } @@ -179,8 +179,8 @@ class CRM_Report_BAO_ReportInstance extends CRM_Report_DAO_ReportInstance { // add / update navigation as required if (!empty($navigationParams)) { - if (!CRM_Utils_Array::value('id',$params) && - !CRM_Utils_Array::value('instance_id',$params) && + if (!CRM_Utils_Array::value('id',$params) && + !CRM_Utils_Array::value('instance_id',$params) && CRM_Utils_Array::value('id', $navigationParams)) { unset($navigationParams['id']); } diff --git a/CRM/Report/Form/Member/Detail.php b/CRM/Report/Form/Member/Detail.php index 43cdcf8694..d170de8ca7 100644 --- a/CRM/Report/Form/Member/Detail.php +++ b/CRM/Report/Form/Member/Detail.php @@ -436,7 +436,7 @@ class CRM_Report_Form_Member_Detail extends CRM_Report_Form { if ($this->_contribField) { $this->_orderBy .= ", {$this->_aliases['civicrm_contribution']}.receive_date DESC"; - } + } } function postProcess() { diff --git a/CRM/Upgrade/4.3.5.msg_template/message_templates/event_offline_receipt_html.tpl b/CRM/Upgrade/4.3.5.msg_template/message_templates/event_offline_receipt_html.tpl index 4c25e016df..d26a95bf4c 100644 --- a/CRM/Upgrade/4.3.5.msg_template/message_templates/event_offline_receipt_html.tpl +++ b/CRM/Upgrade/4.3.5.msg_template/message_templates/event_offline_receipt_html.tpl @@ -178,12 +178,12 @@ registration process.{/ts}

{ts}Qty{/ts} {ts}Each{/ts} {ts}Total{/ts} - {if $pricesetFieldsCount }{ts}Total Participants{/ts}{/if} + {if $pricesetFieldsCount }{ts}Total Participants{/ts}{/if} {foreach from=$value item=line} - {if $line.html_type eq 'Text'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description}
{$line.description|truncate:30:"..."}
{/if} + {if $line.html_type eq 'Text'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description}
{$line.description|truncate:30:"..."}
{/if} {$line.qty} @@ -194,11 +194,11 @@ registration process.{/ts}

{$line.line_total|crmMoney} - {if $pricesetFieldsCount } - - {$line.participant_count} + {if $pricesetFieldsCount } + + {$line.participant_count} - {/if} + {/if} {/foreach} @@ -228,10 +228,10 @@ registration process.{/ts}

{if $pricesetFieldsCount } - - {ts}Total Participants{/ts} + + {ts}Total Participants{/ts} - {assign var="count" value= 0} + {assign var="count" value= 0} {foreach from=$lineItem item=pcount} {assign var="lineItemCount" value=0} {if $pcount neq 'skip'} @@ -240,11 +240,11 @@ registration process.{/ts}

{/foreach} {if $lineItemCount < 1 } assign var="lineItemCount" value=1} - {/if} + {/if} {assign var="count" value=$count+$lineItemCount} {/if} {/foreach} - {$count} + {$count} {/if} diff --git a/CRM/Upgrade/4.3.5.msg_template/message_templates/event_offline_receipt_text.tpl b/CRM/Upgrade/4.3.5.msg_template/message_templates/event_offline_receipt_text.tpl index 1c6a5f4fa5..02985ca010 100644 --- a/CRM/Upgrade/4.3.5.msg_template/message_templates/event_offline_receipt_text.tpl +++ b/CRM/Upgrade/4.3.5.msg_template/message_templates/event_offline_receipt_text.tpl @@ -145,14 +145,14 @@ registration process.{/ts} {/foreach} {if $lineItemCount < 1 } {assign var="lineItemCount" value=1} - {/if} + {/if} {assign var="count" value=$count+$lineItemCount} {/if} {/foreach} {ts}Total Participants{/ts}: {$count} {/if} - + {if $is_pay_later } ==========================================================={if $pricesetFieldsCount }===================={/if} diff --git a/CRM/Upgrade/4.3.5.msg_template/message_templates/event_online_receipt_html.tpl b/CRM/Upgrade/4.3.5.msg_template/message_templates/event_online_receipt_html.tpl index ef247c007c..704017e841 100644 --- a/CRM/Upgrade/4.3.5.msg_template/message_templates/event_online_receipt_html.tpl +++ b/CRM/Upgrade/4.3.5.msg_template/message_templates/event_online_receipt_html.tpl @@ -21,13 +21,13 @@ -

Dear {contact.display_name},

+

Dear {contact.display_name},

{if $event.confirm_email_text AND (not $isOnWaitlist AND not $isRequireApproval)}

{$event.confirm_email_text|htmlize}

{else} -

Thank you for your participation. This letter is a confirmation that your registration has been received and your status has been updated to {if $isOnWaitlist}waitlisted{else}registered{/if} for the following:

+

Thank you for your participation. This letter is a confirmation that your registration has been received and your status has been updated to {if $isOnWaitlist}waitlisted{else}registered{/if} for the following:

{/if} @@ -72,20 +72,20 @@ registration process.{/ts}

{if $conference_sessions} - {ts}Your schedule:{/ts} + {ts}Your schedule:{/ts} - {assign var='group_by_day' value='NA'} - {foreach from=$conference_sessions item=session} - {if $session.start_date|date_format:"%Y/%m/%d" != $group_by_day|date_format:"%Y/%m/%d"} - {assign var='group_by_day' value=$session.start_date} + {assign var='group_by_day' value='NA'} + {foreach from=$conference_sessions item=session} + {if $session.start_date|date_format:"%Y/%m/%d" != $group_by_day|date_format:"%Y/%m/%d"} + {assign var='group_by_day' value=$session.start_date} {$group_by_day|date_format:"%m/%d/%Y"}
- {/if} - {$session.start_date|crmDate:0:1}{if $session.end_date}-{$session.end_date|crmDate:0:1}{/if} {$session.title}
- {if $session.location}    {$session.location}
{/if} - {/foreach} + {/if} + {$session.start_date|crmDate:0:1}{if $session.end_date}-{$session.end_date|crmDate:0:1}{/if} {$session.title}
+ {if $session.location}    {$session.location}
{/if} + {/foreach} {/if} @@ -180,7 +180,7 @@ registration process.{/ts}

- {$payer.name} + {$payer.name} {/if} @@ -212,7 +212,7 @@ registration process.{/ts}

{ts}Qty{/ts} {ts}Each{/ts} {ts}Total{/ts} - {if $pricesetFieldsCount }{ts}Total Participants{/ts}{/if} + {if $pricesetFieldsCount }{ts}Total Participants{/ts}{/if} {foreach from=$value item=line} @@ -228,7 +228,7 @@ registration process.{/ts}

{$line.line_total|crmMoney:$currency} - {if $pricesetFieldsCount }{$line.participant_count} {/if} + {if $pricesetFieldsCount }{$line.participant_count} {/if} {/foreach} @@ -252,17 +252,17 @@ registration process.{/ts}

{ts}Total Amount{/ts} - + {$totalAmount|crmMoney:$currency} {if $hookDiscount.message}({$hookDiscount.message}){/if} {if $pricesetFieldsCount } - - {ts}Total Participants{/ts} + + {ts}Total Participants{/ts} - {assign var="count" value= 0} + {assign var="count" value= 0} {foreach from=$lineItem item=pcount} {assign var="lineItemCount" value=0} {if $pcount neq 'skip'} @@ -271,7 +271,7 @@ registration process.{/ts}

{/foreach} {if $lineItemCount < 1 } {assign var="lineItemCount" value=1} - {/if} + {/if} {assign var="count" value=$count+$lineItemCount} {/if} {/foreach} @@ -414,8 +414,8 @@ registration process.{/ts}

{$customProfile.title.$pid} {foreach from=$eachProfile item=val key=field} {foreach from=$val item=v key=f} - {$field} - {$v} + {$field} + {$v} {/foreach} {/foreach} @@ -442,7 +442,7 @@ registration process.{/ts}

{/foreach} {/foreach} {/if} - + diff --git a/CRM/Upgrade/4.3.5.msg_template/message_templates/event_online_receipt_text.tpl b/CRM/Upgrade/4.3.5.msg_template/message_templates/event_online_receipt_text.tpl index f34add1949..2e18deffb4 100644 --- a/CRM/Upgrade/4.3.5.msg_template/message_templates/event_online_receipt_text.tpl +++ b/CRM/Upgrade/4.3.5.msg_template/message_templates/event_online_receipt_text.tpl @@ -162,14 +162,14 @@ You were registered by: {$payer.name} {/foreach} {if $lineItemCount < 1 } {assign var="lineItemCount" value=1} - {/if} + {/if} {assign var="count" value=$count+$lineItemCount} {/if} {/foreach} {ts}Total Participants{/ts}: {$count} {/if} - + {if $register_date} {ts}Registration Date{/ts}: {$register_date|crmDate} {/if} @@ -233,7 +233,7 @@ You were registered by: {$payer.name} {foreach from=$customPost item=customPos key=j} ==========================================================={if $pricesetFieldsCount }===================={/if} -{$customPost_grouptitle.$j} +{$customPost_grouptitle.$j} ==========================================================={if $pricesetFieldsCount }===================={/if} {foreach from=$customPos item=customValue key=customName} diff --git a/CRM/Upgrade/Incremental/php/FourThree.php b/CRM/Upgrade/Incremental/php/FourThree.php index c0c8429c88..d0b97abaa6 100644 --- a/CRM/Upgrade/Incremental/php/FourThree.php +++ b/CRM/Upgrade/Incremental/php/FourThree.php @@ -299,7 +299,7 @@ ADD COLUMN premiums_nothankyou_label varchar(255) COLLATE utf8_unicode_ci DEFA function upgrade_4_3_4($rev) { $this->addTask(ts('Upgrade DB to 4.3.4: SQL'), 'task_4_3_x_runSql', $rev); } - + function upgrade_4_3_5($rev) { // CRM-12156 $config = CRM_Core_Config::singleton(); @@ -310,7 +310,7 @@ WHERE CONSTRAINT_NAME = 'FK_civicrm_financial_item_contact_id' AND CONSTRAINT_SCHEMA = %1"; $params = array(1 => array($dbname['database'], 'String')); $onDelete = CRM_Core_DAO::singleValueQuery($sql, $params, TRUE, FALSE); - + if ($onDelete != 'CASCADE') { $query = "ALTER TABLE `civicrm_financial_item` DROP FOREIGN KEY FK_civicrm_financial_item_contact_id, diff --git a/CRM/Utils/Hook.php b/CRM/Utils/Hook.php index e7cb5189ac..efc8ac72b7 100644 --- a/CRM/Utils/Hook.php +++ b/CRM/Utils/Hook.php @@ -472,10 +472,10 @@ abstract class CRM_Utils_Hook { * This hook is called when rendering the tabs * used for events and potentially contribution pages, etc * @param string $tabset - name of the screen or visual element - * @param array $tabs - the array of tabs that will be displayed + * @param array $tabs - the array of tabs that will be displayed * @param array $context - extra data about the screen or context in which the tab is used * - * @return null + * @return null * @access public */ static function tabset($tabsetName, &$tabs, $context) { @@ -1314,7 +1314,7 @@ abstract class CRM_Utils_Hook { } /** - * This hook is called while building the core search query, + * This hook is called while building the core search query, * so hook implementers can provide their own query objects which alters/extends core search. * * @param Array $queryObjects diff --git a/CRM/Utils/System/Joomla.php b/CRM/Utils/System/Joomla.php index 52414fdb55..19b03bf917 100644 --- a/CRM/Utils/System/Joomla.php +++ b/CRM/Utils/System/Joomla.php @@ -602,7 +602,7 @@ class CRM_Utils_System_Joomla extends CRM_Utils_System_Base { // Get the framework. if (file_exists($joomlaBase . '/libraries/import.legacy.php')) { - require $joomlaBase . '/libraries/import.legacy.php'; + require $joomlaBase . '/libraries/import.legacy.php'; } require $joomlaBase . '/libraries/import.php'; require $joomlaBase . '/libraries/joomla/event/dispatcher.php'; diff --git a/css/Audit/style.css b/css/Audit/style.css index 934d0e3b0d..aec13991b9 100644 --- a/css/Audit/style.css +++ b/css/Audit/style.css @@ -82,7 +82,7 @@ } .activity a:link, .activity a:visited { -} +} .activityheader { display: none; diff --git a/css/civicrm.css b/css/civicrm.css index a883418e34..e1c706378d 100644 --- a/css/civicrm.css +++ b/css/civicrm.css @@ -1254,7 +1254,7 @@ div.crm-container label { height: auto; margin: 0 1px; padding: 2px 5px; - font-family: Arial, Helvetica, sans-serif; + font-family: Arial, Helvetica, sans-serif; } .crm-container #alpha-filter a { diff --git a/js/jquery/jquery.crmasmselect.js b/js/jquery/jquery.crmasmselect.js index 902e09907f..ffee488329 100644 --- a/js/jquery/jquery.crmasmselect.js +++ b/js/jquery/jquery.crmasmselect.js @@ -57,18 +57,18 @@ // initialize the alternate select multiple // this loop ensures uniqueness, in case of existing crmasmSelects placed by ajax (1.0.3) - while($("#" + options.containerClass + index).size() > 0) index++; + while($("#" + options.containerClass + index).size() > 0) index++; $select = $("") .addClass(options.selectClass) .attr('name', options.selectClass + index) - .attr('id', options.selectClass + index); + .attr('id', options.selectClass + index); - $selectRemoved = $(""); + $selectRemoved = $(""); $ol = $("<" + options.listType + ">") .addClass(options.listClass) - .attr('id', options.listClass + index); + .attr('id', options.listClass + index); $container = $("
") .addClass(options.containerClass) @@ -410,11 +410,12 @@ 'id': optionId, 'item': $ol.children("[rel=" + optionId + "]"), 'type': type - }]); + }]); } init(); }); }; -})(jQuery); +})(jQuery); + diff --git a/js/jquery/jquery.crmeditable.js b/js/jquery/jquery.crmeditable.js index fea1a794f7..cd7c9f02ac 100644 --- a/js/jquery/jquery.crmeditable.js +++ b/js/jquery/jquery.crmeditable.js @@ -27,7 +27,7 @@ * * * This offers two features: -* - crmEditable() edit in place of a single field +* - crmEditable() edit in place of a single field * (mostly a wrapper that binds jeditable features with the ajax api and replies on crm-entity crmf-{field} html conventions) * if you want to add an edit in place on a template: * - add a class crm-entity and id {EntityName}-{Entityid} higher in the dom @@ -90,7 +90,7 @@ if (!getEntityID (this,function (e,id) { entity=e; params.id = id; - + })) { return }; params['field']=getFieldName(this); @@ -156,7 +156,7 @@ var id= $i.closest('.crm-entity').attr('id'); if (id) { var e=id.match(/(\S*)-(\S*)/); - if (!e) + if (!e) console && console.log && console.log("Couldn't get the entity id. You need to set class='crm-entity' id='{entityName}-{id}'"); formSettings.entity=e[1]; formSettings.id=e[2]; diff --git a/templates/CRM/Admin/Page/PaymentProcessor.hlp b/templates/CRM/Admin/Page/PaymentProcessor.hlp index db9d3f0189..2cbf67b802 100644 --- a/templates/CRM/Admin/Page/PaymentProcessor.hlp +++ b/templates/CRM/Admin/Page/PaymentProcessor.hlp @@ -362,16 +362,16 @@ {ts 1='4111111111111111' 2='76'}The test Credit Card number is %1 - this is the only credit card number that will work on the test gateway. The test Total Amount can be any amount except one that ends in a value of .%2 (e.g. $10.%2) - all amounts ending in .%2 will return a failed response.{/ts} {/htxt} -{htxt id='Payment_Express-test-url-site'} {ts}This is the URL for accessing the DPS/Payment Express payment site. +{htxt id='Payment_Express-test-url-site'} {ts}This is the URL for accessing the DPS/Payment Express payment site. If you have been given a MAC key please fill in the Mac Key field, and use https://sec.paymentexpress.com/pxpay/pxpay.aspx for the Site URL. Otherwise use https://sec.paymentexpress.com/pxpay/pxaccess.aspx for the Site URL.{/ts} {/htxt} {htxt id='Payment_Express-live-user-name'} {ts}Payment Express UserID (LIVE account):{/ts} {ts}This is the live user name provided to you by DPS/Payment Express.{/ts}{/htxt} -{htxt id='Payment_Express-live-url-site'} {ts}This is the URL for accessing the DPS/Payment Express payment site. +{htxt id='Payment_Express-live-url-site'} {ts}This is the URL for accessing the DPS/Payment Express payment site. If you have been given a MAC key please fill in the Mac Key field, and use https://sec.paymentexpress.com/pxpay/pxpay.aspx for the Site URL. -Otherwise use https://sec.paymentexpress.com/pxpay/pxaccess.aspx for the Site URL.{/ts} {/htxt} +Otherwise use https://sec.paymentexpress.com/pxpay/pxaccess.aspx for the Site URL.{/ts} {/htxt} {htxt id='Elavon-live-user-name'}

{ts}This is the LIVE Elavon Merchant ID associated with your Elavon account.{/ts}

diff --git a/tests/phpunit/CRM/Contact/BAO/QueryTestDataProvider.php b/tests/phpunit/CRM/Contact/BAO/QueryTestDataProvider.php index 4a64b6f7d7..800eb545e5 100644 --- a/tests/phpunit/CRM/Contact/BAO/QueryTestDataProvider.php +++ b/tests/phpunit/CRM/Contact/BAO/QueryTestDataProvider.php @@ -97,7 +97,7 @@ class CRM_Contact_BAO_QueryTestDataProvider implements Iterator { '18', '19', '20', '22', '23', '24', ), ), - + // gender_id 1 array( 'fv' => array('gender' => 'Female'), diff --git a/tests/phpunit/CRM/Financial/BAO/FinancialTypeAccountTest.php b/tests/phpunit/CRM/Financial/BAO/FinancialTypeAccountTest.php index 975ac1f849..5ad19568ba 100755 --- a/tests/phpunit/CRM/Financial/BAO/FinancialTypeAccountTest.php +++ b/tests/phpunit/CRM/Financial/BAO/FinancialTypeAccountTest.php @@ -157,7 +157,7 @@ class CRM_Financial_BAO_FinancialTypeAccountTest extends CiviUnitTestCase { 'name' => 'paymentProcessor', ); $processor = CRM_Financial_BAO_PaymentProcessor::create($params); - + $account = CRM_Financial_BAO_FinancialTypeAccount::getFinancialAccount( $processor->id, 'civicrm_payment_processor' diff --git a/tests/phpunit/CRM/Report/Form/Contribute/DetailTest.php b/tests/phpunit/CRM/Report/Form/Contribute/DetailTest.php index 468f75a8b2..a941b9caf4 100644 --- a/tests/phpunit/CRM/Report/Form/Contribute/DetailTest.php +++ b/tests/phpunit/CRM/Report/Form/Contribute/DetailTest.php @@ -45,7 +45,7 @@ class CRM_Report_Form_Contribute_DetailTest extends CiviReportTestCase { return array( array( 'CRM_Report_Form_Contribute_Detail', - array( + array( 'fields' => array( 'first_name', 'email', @@ -58,7 +58,7 @@ class CRM_Report_Form_Contribute_DetailTest extends CiviReportTestCase { // FIXME: add filters ), 'fixtures/dataset.sql', - 'fixtures/report.csv', + 'fixtures/report.csv', ), ); } @@ -74,7 +74,7 @@ class CRM_Report_Form_Contribute_DetailTest extends CiviReportTestCase { */ public function testReportOutput($reportClass, $inputParams, $dataSet, $expectedOutputCsvFile) { $this->foreignKeyChecksOff(); - + $this->quickCleanup(self::$_tablesToTruncate); $config = CRM_Core_Config::singleton(); diff --git a/tests/templates/documentFunction.tpl b/tests/templates/documentFunction.tpl index c28b59f876..9343e575d6 100644 --- a/tests/templates/documentFunction.tpl +++ b/tests/templates/documentFunction.tpl @@ -1,7 +1,7 @@ {literal}