From 1393e47e26379edf1c6c55c67e5d7f7d95be1229 Mon Sep 17 00:00:00 2001 From: eileen Date: Sun, 26 May 2013 23:04:08 +1200 Subject: [PATCH] remove tabs (whitespace only) --- CRM/SMS/Provider.php | 28 ++++++++-------- .../Incremental/sql/4.2.alpha1.mysql.tpl | 26 +++++++-------- .../Incremental/sql/4.3.beta4.mysql.tpl | 6 ++-- CRM/Utils/Hook.php | 4 +-- templates/CRM/Event/Page/EventInfo.tpl | 10 +++--- .../CRM/Financial/Page/FinancialAccount.tpl | 12 +++---- .../CRM/Financial/Page/FinancialType.tpl | 26 +++++++-------- .../Financial/Page/FinancialTypeAccount.tpl | 32 +++++++++---------- templates/CRM/Pledge/Page/UserDashboard.tpl | 2 +- 9 files changed, 73 insertions(+), 73 deletions(-) diff --git a/CRM/SMS/Provider.php b/CRM/SMS/Provider.php index 3bcf023234..e26afced8d 100644 --- a/CRM/SMS/Provider.php +++ b/CRM/SMS/Provider.php @@ -126,10 +126,10 @@ INNER JOIN civicrm_mailing_job mj ON mj.mailing_id = m.id AND mj.id = %1"; } if (!$sourceContactID) { - $sourceContactID = CRM_Utils_Array::value('Contact', $headers); + $sourceContactID = CRM_Utils_Array::value('Contact', $headers); } if (!$sourceContactID) { - return false; + return false; } $activityTypeID = CRM_Core_OptionGroup::getValue('activity_type', 'SMS', 'name'); @@ -160,20 +160,20 @@ INNER JOIN civicrm_mailing_job mj ON mj.mailing_id = m.id AND mj.id = %1"; } function processInbound($from, $body, $to = NULL, $trackID = NULL) { - $formatFrom = $this->formatPhone($this->stripPhone($from), $like, "like"); + $formatFrom = $this->formatPhone($this->stripPhone($from), $like, "like"); $escapedFrom = CRM_Utils_Type::escape($formatFrom, 'String'); $fromContactID = CRM_Core_DAO::singleValueQuery('SELECT contact_id FROM civicrm_phone WHERE phone LIKE "' . $escapedFrom . '"'); - + if (! $fromContactID) { - // unknown mobile sender -- create new contact - // use fake @mobile.sms email address for new contact since civi - // requires email or name for all contacts - $locationTypes =& CRM_Core_PseudoConstant::locationType(); - $phoneTypes =& CRM_Core_PseudoConstant::phoneType(); - $phoneloc = array_search( 'Home', $locationTypes ); - $phonetype = array_search( 'Mobile', $phoneTypes ); - $stripFrom = $this->stripPhone($from); - $contactparams = + // unknown mobile sender -- create new contact + // use fake @mobile.sms email address for new contact since civi + // requires email or name for all contacts + $locationTypes =& CRM_Core_PseudoConstant::locationType(); + $phoneTypes =& CRM_Core_PseudoConstant::phoneType(); + $phoneloc = array_search( 'Home', $locationTypes ); + $phonetype = array_search( 'Mobile', $phoneTypes ); + $stripFrom = $this->stripPhone($from); + $contactparams = Array ( 'contact_type' => 'Individual', 'email' => Array ( 1 => Array ( 'location_type_id' => $phoneloc, 'email' => $stripFrom . '@mobile.sms' ) @@ -183,7 +183,7 @@ INNER JOIN civicrm_mailing_job mj ON mj.mailing_id = m.id AND mj.id = %1"; 'phone' => $stripFrom ) ) ); - $fromContact = CRM_Contact_BAO_Contact::create($contactparams, FALSE, TRUE, FALSE); + $fromContact = CRM_Contact_BAO_Contact::create($contactparams, FALSE, TRUE, FALSE); $fromContactID = $fromContact->id; } diff --git a/CRM/Upgrade/Incremental/sql/4.2.alpha1.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.2.alpha1.mysql.tpl index 098f37d8af..e0fa076fde 100644 --- a/CRM/Upgrade/Incremental/sql/4.2.alpha1.mysql.tpl +++ b/CRM/Upgrade/Incremental/sql/4.2.alpha1.mysql.tpl @@ -42,7 +42,7 @@ ALTER TABLE `civicrm_batch` ADD `total` decimal(20,2) DEFAULT NULL COMMENT 'Tota ALTER TABLE `civicrm_batch` ADD `item_count` int(10) unsigned NOT NULL COMMENT 'Number of items in a batch.'; ALTER TABLE `civicrm_batch` ADD CONSTRAINT `FK_civicrm_batch_saved_search_id` FOREIGN KEY (`saved_search_id`) REFERENCES `civicrm_saved_search` (`id`) ON DELETE SET NULL; - + --batch type and batch status option groups INSERT INTO `civicrm_option_group` (`name`, {localize field='title'}title{/localize}, `is_reserved`, `is_active`) @@ -104,10 +104,10 @@ VALUES --navigation menu entries SELECT @navContributionsID := MAX(id) FROM civicrm_navigation where name = 'Contributions'; SELECT @navMembershipsID := MAX(id) FROM civicrm_navigation where name = 'Memberships'; - + INSERT INTO civicrm_navigation ( domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight ) -VALUES +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 ); @@ -215,13 +215,13 @@ ALTER TABLE `civicrm_contribution_page` ADD COLUMN is_confirm_enabled tinyint(4) {/if} ALTER TABLE civicrm_group ADD title_{$locale} VARCHAR(64); ALTER TABLE civicrm_group ADD UNIQUE KEY `UI_title_{$locale}` (title_{$locale}); - - ALTER TABLE `civicrm_batch` CHANGE `label_{$locale}` `title_{$locale}` varchar(64) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT 'Friendly Name.'; + + ALTER TABLE `civicrm_batch` CHANGE `label_{$locale}` `title_{$locale}` varchar(64) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT 'Friendly Name.'; UPDATE civicrm_group SET title_{$locale} = title; ALTER TABLE civicrm_survey ADD COLUMN thankyou_title_{$locale} varchar(255) COMMENT 'Title for Thank-you page (header title tag, and display at the top of the page).', - ADD COLUMN thankyou_text_{$locale} text COMMENT 'text and html allowed. displayed above result on success page'; + ADD COLUMN thankyou_text_{$locale} text COMMENT 'text and html allowed. displayed above result on success page'; {/foreach} ALTER TABLE civicrm_group DROP INDEX `UI_title`; @@ -247,10 +247,10 @@ INSERT INTO civicrm_country (name,iso_code,region_id,is_province_abbreviated) VA -- CRM-12428 {if $multilingual} {foreach from=$locales item=locale} - ALTER TABLE `civicrm_price_field_value` CHANGE label_{$locale} label_{$locale} VARCHAR(255) NULL DEFAULT NULL; + ALTER TABLE `civicrm_price_field_value` CHANGE label_{$locale} label_{$locale} VARCHAR(255) NULL DEFAULT NULL; {/foreach} {else} - ALTER TABLE `civicrm_price_field_value` CHANGE `label` `label` VARCHAR(255) NULL DEFAULT NULL; + ALTER TABLE `civicrm_price_field_value` CHANGE `label` `label` VARCHAR(255) NULL DEFAULT NULL; {/if} -- CRM-9714 create a default price set for contribution and membership @@ -261,7 +261,7 @@ ADD `is_quick_config` TINYINT(4) NOT NULL DEFAULT '0' ADD `is_reserved` TINYINT(4) DEFAULT '0' COMMENT 'Is this a predefined system price set (i.e. it can not be deleted, edited)?'; -SELECT @contribution_type_id := max(id) FROM `civicrm_contribution_type` WHERE `name` = 'Member Dues'; +SELECT @contribution_type_id := max(id) FROM `civicrm_contribution_type` WHERE `name` = 'Member Dues'; INSERT INTO `civicrm_price_set` ( `name`, {localize field='title'}`title`{/localize}, `is_active`, `extends`, `is_quick_config`, `is_reserved`, `contribution_type_id`) VALUES ( 'default_contribution_amount', {localize}'Contribution Amount'{/localize}, '1', '2', '1', '1', null), ( 'default_membership_type_amount', {localize}'Membership Amount'{/localize}, '1', '3', '1', '1', @contribution_type_id); @@ -363,19 +363,19 @@ VALUES (@option_group_id_act, {localize field='label'}'Change Membership Type'{/localize}, (SELECT @max_val := @max_val+1), 'Change Membership Type', (SELECT @max_wt := @max_wt+1), {localize field='description'}'Change Membership Type.'{/localize}, 1, 1, @CompId); -- CRM-10084 -INSERT INTO - `civicrm_option_value` (`option_group_id`, {localize field='label'}`label`{/localize}, `value`, `name`, `grouping`, `filter`, `is_default`, `weight`, {localize field='description'}`description`{/localize}, `is_optgroup`, `is_reserved`, `is_active`, `component_id`, `visibility_id`) +INSERT INTO + `civicrm_option_value` (`option_group_id`, {localize field='label'}`label`{/localize}, `value`, `name`, `grouping`, `filter`, `is_default`, `weight`, {localize field='description'}`description`{/localize}, `is_optgroup`, `is_reserved`, `is_active`, `component_id`, `visibility_id`) VALUES (@option_group_id_act, {localize}'Cancel Recurring Contribution'{/localize}, (SELECT @max_val := @max_val+1), 'Cancel Recurring Contribution', NULL,1, 0, (SELECT @max_wt := @max_wt+1), {localize}''{/localize}, 0, 1, 1, NULL, NULL); -- CRM-10090 -INSERT INTO +INSERT INTO `civicrm_option_value` (`option_group_id`, {localize field='label'}`label`{/localize}, `value`, `name`, `grouping`, `filter`, `is_default`, `weight`, {localize field='description'}`description`{/localize}, `is_optgroup`, `is_reserved`, `is_active`, `component_id`, `visibility_id`) VALUES (@option_group_id_act, {localize}'Update Recurring Contribution Billing Details'{/localize}, (SELECT @max_val := @max_val+1), 'Update Recurring Contribution Billing Details', NULL,1, 0, (SELECT @max_wt := @max_wt+1), {localize}''{/localize}, 0, 1, 1, NULL, NULL), (@option_group_id_act, {localize}'Update Recurring Contribution'{/localize}, (SELECT @max_val := @max_val+1), 'Update Recurring Contribution', NULL,1, 0, (SELECT @max_wt := @max_wt+1), {localize}''{/localize}, 0, 1, 1, NULL, NULL); --- CRM-10117 +-- CRM-10117 ALTER TABLE `civicrm_price_field_value` CHANGE `is_active` `is_active` TINYINT( 4 ) NULL DEFAULT '1' COMMENT 'Is this price field value active'; diff --git a/CRM/Upgrade/Incremental/sql/4.3.beta4.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.3.beta4.mysql.tpl index 7f3b28a34d..7e7fce23f3 100644 --- a/CRM/Upgrade/Incremental/sql/4.3.beta4.mysql.tpl +++ b/CRM/Upgrade/Incremental/sql/4.3.beta4.mysql.tpl @@ -7,10 +7,10 @@ ALTER TABLE civicrm_option_value -- CRM-12127 UPDATE civicrm_membership_type cmt -LEFT JOIN civicrm_price_field_value cpfv ON cpfv.membership_type_id = cmt.id +LEFT JOIN civicrm_price_field_value cpfv ON cpfv.membership_type_id = cmt.id LEFT JOIN civicrm_price_field cpf ON cpf.id = cpfv.price_field_id LEFT JOIN civicrm_price_set cps ON cps.id = cpf.price_set_id -SET +SET cpfv.financial_type_id = cmt.financial_type_id, {if !$multilingual} cpfv.label = cmt.name, @@ -21,5 +21,5 @@ cpfv.financial_type_id = cmt.financial_type_id, cpfv.description_{$locale} = cmt.description_{$locale}, {/foreach} {/if} -cpfv.amount = IFNULL(cmt.minimum_fee, 0.00) +cpfv.amount = IFNULL(cmt.minimum_fee, 0.00) WHERE cps.is_quick_config = 1 AND cpfv.membership_type_id IS NOT NULL; \ No newline at end of file diff --git a/CRM/Utils/Hook.php b/CRM/Utils/Hook.php index 6adb9d714d..8b78059011 100644 --- a/CRM/Utils/Hook.php +++ b/CRM/Utils/Hook.php @@ -181,8 +181,8 @@ abstract class CRM_Utils_Hook { foreach ($civiModules as $civiModule) { if (!file_exists($civiModule['filePath'])) { CRM_Core_Session::setStatus( - ts( 'Error loading module file (%1). Please restore the file or disable the module.', array(1 => $civiModule['filePath']) ), - ts( 'Warning'), 'error'); + ts( 'Error loading module file (%1). Please restore the file or disable the module.', array(1 => $civiModule['filePath']) ), + ts( 'Warning'), 'error'); continue; } include_once $civiModule['filePath']; diff --git a/templates/CRM/Event/Page/EventInfo.tpl b/templates/CRM/Event/Page/EventInfo.tpl index 8ce21095a5..ad1cb5eda5 100644 --- a/templates/CRM/Event/Page/EventInfo.tpl +++ b/templates/CRM/Event/Page/EventInfo.tpl @@ -183,22 +183,22 @@ {foreach from=$feeBlock.value name=fees item=value} {assign var=idx value=$smarty.foreach.fees.iteration} - {* Skip price field label for quick_config price sets since it duplicates $event.fee_label *} + {* Skip price field label for quick_config price sets since it duplicates $event.fee_label *} {if $feeBlock.lClass.$idx} {assign var="lClass" value=$feeBlock.lClass.$idx} {else} {assign var="lClass" value="fee_level-label"} {/if} - {if $isQuickConfig && $lClass EQ "price_set_option_group-label"} - {* Skip price field label for quick_config price sets since it duplicates $event.fee_label *} - {else} + {if $isQuickConfig && $lClass EQ "price_set_option_group-label"} + {* Skip price field label for quick_config price sets since it duplicates $event.fee_label *} + {else} {if $isPriceSet & $feeBlock.isDisplayAmount.$idx} {/if} - {/if} + {/if} {/foreach}
{$feeBlock.label.$idx}{$feeBlock.value.$idx|crmMoney}
diff --git a/templates/CRM/Financial/Page/FinancialAccount.tpl b/templates/CRM/Financial/Page/FinancialAccount.tpl index 5b692641b7..a4dddcc059 100644 --- a/templates/CRM/Financial/Page/FinancialAccount.tpl +++ b/templates/CRM/Financial/Page/FinancialAccount.tpl @@ -34,7 +34,7 @@ {if $action ne 1 and $action ne 2}
-
{ts}Add Financial Account{/ts} +
{ts}Add Financial Account{/ts}
{/if} @@ -44,8 +44,8 @@

{strip} - {* handle enable/disable actions*} - {include file="CRM/common/enableDisable.tpl"} + {* handle enable/disable actions*} + {include file="CRM/common/enableDisable.tpl"} @@ -60,7 +60,7 @@ {foreach from=$rows item=row} - + @@ -76,7 +76,7 @@ {if $action ne 1 and $action ne 2}
-
{ts}Add Financial Account{/ts} +
{ts}Add Financial Account{/ts}
{/if} @@ -86,6 +86,6 @@
{capture assign=crmURL}{crmURL q="action=add&reset=1"}{/capture} {ts 1=$crmURL}There are no Financial Account entered. You can add one.{/ts} - + {/if} {/if} diff --git a/templates/CRM/Financial/Page/FinancialType.tpl b/templates/CRM/Financial/Page/FinancialType.tpl index a58a5d070b..f2b7d54766 100644 --- a/templates/CRM/Financial/Page/FinancialType.tpl +++ b/templates/CRM/Financial/Page/FinancialType.tpl @@ -38,13 +38,13 @@

{strip} - {* handle enable/disable actions*} - {include file="CRM/common/enableDisable.tpl"} + {* handle enable/disable actions*} + {include file="CRM/common/enableDisable.tpl"}
{ts}Name{/ts}
{$row.name}{$row.name} {$row.description} {$row.accounting_code} {$row.financial_account_type_id}{if $row.account_type_code} ({$row.account_type_code}){/if}
- + @@ -52,21 +52,21 @@ {foreach from=$rows item=row} - - - - - - - + + + + + + + {/foreach}
{ts}Name{/ts} {ts}Description{/ts}{ts}Financial Accounts{/ts}{ts}Financial Accounts{/ts} {ts}Deductible?{/ts} {ts}Reserved?{/ts} {ts}Enabled?{/ts}
{$row.name}{$row.description}{$row.financial_account}{if $row.is_deductible eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if}{if $row.is_reserved eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if}{if $row.is_active eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if}{$row.action|replace:'xx':$row.id}{$row.name}{$row.description}{$row.financial_account}{if $row.is_deductible eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if}{if $row.is_reserved eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if}{if $row.is_active eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if}{$row.action|replace:'xx':$row.id}
{/strip} {if $action ne 1 and $action ne 2} -
-
{ts}Add Financial Type{/ts} +
+
{ts}Add Financial Type{/ts}
{/if}
@@ -76,6 +76,6 @@
{capture assign=crmURL}{crmURL q="action=add&reset=1"}{/capture} {ts 1=$crmURL}There are no Financial Types entered. You can add one.{/ts} -
+ {/if} {/if} diff --git a/templates/CRM/Financial/Page/FinancialTypeAccount.tpl b/templates/CRM/Financial/Page/FinancialTypeAccount.tpl index d64d58fa26..ba7beaae5b 100644 --- a/templates/CRM/Financial/Page/FinancialTypeAccount.tpl +++ b/templates/CRM/Financial/Page/FinancialTypeAccount.tpl @@ -30,14 +30,14 @@
{if $action ne 1 and $action ne 2} -
-
{ts}Assign Account{/ts} -
{ts}Edit Financial Type{/ts} +
+
{ts}Assign Account{/ts} +
{ts}Edit Financial Type{/ts}
{/if} {strip} - {* handle enable/disable actions*} - {include file="CRM/common/enableDisable.tpl"} + {* handle enable/disable actions*} + {include file="CRM/common/enableDisable.tpl"} @@ -50,22 +50,22 @@ {foreach from=$rows item=row} - - - - - - - + + + + + + + {/foreach}
{ts}Relationship{/ts}
{$row.account_relationship}{$row.financial_account}{$row.accounting_code}{$row.financial_account_type}{if $row.account_type_code} ({$row.account_type_code}){/if}{$row.owned_by}{if $row.is_active eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if}{$row.action|replace:'xx':$row.id}{$row.account_relationship}{$row.financial_account}{$row.accounting_code}{$row.financial_account_type}{if $row.account_type_code} ({$row.account_type_code}){/if}{$row.owned_by}{if $row.is_active eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if}{$row.action|replace:'xx':$row.id}
{/strip} {if $action ne 1 and $action ne 2} -
-
{ts}Assign Account{/ts} -
{ts}Edit Financial Type{/ts} +
+
{ts}Assign Account{/ts} +
{ts}Edit Financial Type{/ts}
{/if}
@@ -75,6 +75,6 @@
{capture assign=crmURL}{crmURL q="action=add&reset=1&aid=$aid"}{/capture} {ts 1=$crmURL}There are no financial accounts assigned to this financial type. You can assign one.{/ts} -
+
{/if} {/if} diff --git a/templates/CRM/Pledge/Page/UserDashboard.tpl b/templates/CRM/Pledge/Page/UserDashboard.tpl index 3ff34a2890..21392327cd 100644 --- a/templates/CRM/Pledge/Page/UserDashboard.tpl +++ b/templates/CRM/Pledge/Page/UserDashboard.tpl @@ -81,7 +81,7 @@ {ts}Pledger{/ts} {ts}Amount{/ts} - {ts}Financial Type{/ts} + {ts}Financial Type{/ts} {ts}Create date{/ts} {ts}Acknowledgment Sent{/ts} {ts}Acknowledgment Date{/ts} -- 2.25.1