Skip to content

Commit

Permalink
CRM-12595 fix formatting in remaing files
Browse files Browse the repository at this point in the history
  • Loading branch information
eileenmcnaughton committed May 17, 2013
1 parent 366fe2a commit 03e0400
Show file tree
Hide file tree
Showing 71 changed files with 797 additions and 761 deletions.
27 changes: 26 additions & 1 deletion CRM/Dedupe/BAO/QueryBuilder/IndividualUnsupervised.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,29 @@
<?php
/*
+--------------------------------------------------------------------+
| CiviCRM version 4.3 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2013 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
| CiviCRM is free software; you can copy, modify, and distribute it |
| under the terms of the GNU Affero General Public License |
| Version 3, 19 November 2007 and the CiviCRM Licensing Exception. |
| |
| CiviCRM is distributed in the hope that it will be useful, but |
| WITHOUT ANY WARRANTY; without even the implied warranty of |
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| See the GNU Affero General Public License for more details. |
| |
| You should have received a copy of the GNU Affero General Public |
| License and the CiviCRM Licensing Exception along |
| with this program; if not, contact CiviCRM LLC |
| at info[AT]civicrm[DOT]org. If you have questions about the |
| GNU Affero General Public License or the licensing of CiviCRM, |
| see the CiviCRM license FAQ at http://civicrm.org/licensing |
+--------------------------------------------------------------------+
*/
class CRM_Dedupe_BAO_QueryBuilder_IndividualUnsupervised extends CRM_Dedupe_BAO_QueryBuilder {

static function record($rg) {
Expand Down Expand Up @@ -62,7 +87,7 @@ static function internalOptimized($rg) {
FROM emails
JOIN civicrm_contact as contact1 on contact1.id=contact_id1
JOIN civicrm_contact as contact2 on contact2.id=contact_id2
WHERE contact1.contact_type='Individual'
WHERE contact1.contact_type='Individual'
AND contact2.contact_type='Individual'
AND " . self::internalFilters($rg);

Expand Down
2 changes: 1 addition & 1 deletion CRM/Event/BAO/Participant.php
Original file line number Diff line number Diff line change
Expand Up @@ -1765,7 +1765,7 @@ static function createDiscountTrxn($eventID, $contributionParams, $feeLevel) {
*
* CRM-12155
*
* @param integer $contactId contact id
* @param integer $contactId contact id
*
* @access public
* @static
Expand Down
4 changes: 2 additions & 2 deletions CRM/Event/BAO/ParticipantStatusType.php
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,8 @@ public function process($params) {
LEFT JOIN civicrm_event event ON ( event.id = participant.event_id )
WHERE participant.status_id IN {$statusIds}
AND (event.end_date > now() OR event.end_date IS NULL)
AND event.is_active = 1
ORDER BY participant.register_date, participant.id
AND event.is_active = 1
ORDER BY participant.register_date, participant.id
";
$dao = CRM_Core_DAO::executeQuery($query);
while ($dao->fetch()) {
Expand Down
28 changes: 27 additions & 1 deletion CRM/Event/Cart/BAO/MerParticipant.php
Original file line number Diff line number Diff line change
@@ -1,10 +1,36 @@
<?php
/*
+--------------------------------------------------------------------+
| CiviCRM version 4.3 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2013 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
| CiviCRM is free software; you can copy, modify, and distribute it |
| under the terms of the GNU Affero General Public License |
| Version 3, 19 November 2007 and the CiviCRM Licensing Exception. |
| |
| CiviCRM is distributed in the hope that it will be useful, but |
| WITHOUT ANY WARRANTY; without even the implied warranty of |
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| See the GNU Affero General Public License for more details. |
| |
| You should have received a copy of the GNU Affero General Public |
| License and the CiviCRM Licensing Exception along |
| with this program; if not, contact CiviCRM LLC |
| at info[AT]civicrm[DOT]org. If you have questions about the |
| GNU Affero General Public License or the licensing of CiviCRM, |
| see the CiviCRM license FAQ at http://civicrm.org/licensing |
+--------------------------------------------------------------------+
*/

class CRM_Event_Cart_BAO_MerParticipant extends CRM_Event_BAO_Participant {
public $email = NULL;
public $contribution_id = NULL;
public $cart = NULL;

//XXX
//XXX
function __construct($participant = NULL) {
parent::__construct();
$a = (array)$participant;
Expand Down
6 changes: 3 additions & 3 deletions CRM/Event/Cart/Form/Checkout/Payment.php
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ function buildPaymentFields() {
foreach ($this->cart->get_main_events_in_carts() as $event_in_cart) {
if ($payment_processor_id == NULL && $event_in_cart->event->payment_processor != NULL) {
$payment_processor_id = $event_in_cart->event->payment_processor;
$this->financial_type_id = $event_in_cart->event->financial_type_id;
$this->financial_type_id = $event_in_cart->event->financial_type_id;
}
else {
if ($event_in_cart->event->payment_processor != NULL && $event_in_cart->event->payment_processor != $payment_processor_id) {
Expand Down Expand Up @@ -559,7 +559,7 @@ function make_payment(&$params) {
'payment_processor' => $this->_paymentProcessor['payment_processor_type'],
'trxn_id' => $result['trxn_id'],
);
$trxn = new CRM_Financial_DAO_FinancialTrxn();
$trxn = new CRM_Financial_DAO_FinancialTrxn();
$trxn->copyValues($trxnParams);
if (!CRM_Utils_Rule::currencyCode($trxn->currency)) {
$config = CRM_Core_Config::singleton();
Expand Down Expand Up @@ -618,7 +618,7 @@ function record_contribution(&$mer_participant, &$params, $event) {
'amount' => $params['amount'],
'currency' => CRM_Utils_Array::value('currencyID', $params),
);
$entity_trxn =& new CRM_Financial_DAO_EntityFinancialTrxn();
$entity_trxn =& new CRM_Financial_DAO_EntityFinancialTrxn();
$entity_trxn->copyValues($entity_financial_trxn_params);
$entity_trxn->save();
}
Expand Down
4 changes: 2 additions & 2 deletions CRM/Event/Form/ManageEvent/EventInfo.php
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@ public function postProcess() {
CRM_Price_BAO_Set::addTo('civicrm_event', $event->id, $priceSetId);
}
}

$this->set('id', $event->id);

if ($this->_action & CRM_Core_Action::ADD) {
Expand Down Expand Up @@ -380,7 +380,7 @@ public function getTitle() {
return ts('Event Information and Settings');
}

/* Retrieve event template custom data values
/* Retrieve event template custom data values
* and set as default values for current new event.
*
* @params int $tempId event template id.
Expand Down
6 changes: 3 additions & 3 deletions CRM/Event/Form/ManageEvent/Fee.php
Original file line number Diff line number Diff line change
Expand Up @@ -257,8 +257,8 @@ public function buildQuickForm() {
NULL, NULL, NULL, NULL,
array('&nbsp;&nbsp;', '&nbsp;&nbsp;', '&nbsp;&nbsp;', '<br/>')
);
// financial type

// financial type
$financialType = CRM_Financial_BAO_FinancialType::getIncomeFinancialType();
$this->add('select', 'financial_type_id', ts('Financial Type'),
array('' => ts('- select -')) + $financialType
Expand Down Expand Up @@ -476,7 +476,7 @@ static function formRule($values) {
}
}
}
if ($values['is_monetary']) {
if ($values['is_monetary']) {
//check if financial type is selected
if (!$values['financial_type_id']) {
$errors['financial_type_id'] = ts("Please select financial type.");
Expand Down
4 changes: 2 additions & 2 deletions CRM/Event/Form/ManageEvent/Location.php
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ function setDefaultValues() {
if (!isset($defaults['address'][1]['country_id'])) {
$defaults['address'][1]['country_id'] = $config->defaultContactCountry;
}

if (!isset($defaults['address'][1]['state_province_id'])) {
$defaults['address'][1]['state_province_id'] = $config->defaultContactStateProvince;
}
Expand Down Expand Up @@ -197,7 +197,7 @@ public function buildQuickForm() {
}

// get the list of location blocks being used by other events

$locationEvents = CRM_Event_BAO_Event::getLocationEvents();
// remove duplicates and make sure that the duplicate entry with key as
// loc_block_id of this event (this->_id) is preserved
Expand Down
2 changes: 1 addition & 1 deletion CRM/Event/Form/ManageEvent/ScheduleReminders.php
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ function setDefaultValues() {
* @access public
*/
public function buildQuickForm() {
$field = 'civicrm_event';
$field = 'civicrm_event';
if ($this->_isTemplate) {
$field = 'event_template';
}
Expand Down
6 changes: 3 additions & 3 deletions CRM/Event/Form/Participant.php
Original file line number Diff line number Diff line change
Expand Up @@ -1173,10 +1173,10 @@ public function postProcess() {

// set source if not set
if (empty($params['source'])) {
$this->_params['participant_source'] = ts('Offline Registration for Event: %2 by: %1', array(1 => $userName, 2 => $eventTitle));
$this->_params['participant_source'] = ts('Offline Registration for Event: %2 by: %1', array(1 => $userName, 2 => $eventTitle));
}
else {
$this->_params['participant_source'] = $params['source'];
$this->_params['participant_source'] = $params['source'];
}
$this->_params['description'] = $this->_params['participant_source'];

Expand Down Expand Up @@ -1253,7 +1253,7 @@ public function postProcess() {
if (($this->_lineItem || !isset($params['proceSetId'])) && !$this->_paymentId && $this->_id) {
CRM_Price_BAO_LineItem::deleteLineItems($this->_id, 'civicrm_participant');
}

if ($this->_mode) {
// add all the additioanl payment params we need
$this->_params["state_province-{$this->_bltID}"] = $this->_params["billing_state_province-{$this->_bltID}"] = CRM_Core_PseudoConstant::stateProvinceAbbreviation($this->_params["billing_state_province_id-{$this->_bltID}"]);
Expand Down
2 changes: 1 addition & 1 deletion CRM/Event/Form/Registration/ThankYou.php
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ public function buildQuickForm() {
$this->assign('email', $email);
}
$this->assignToTemplate();

if ($this->_priceSetId && !CRM_Core_DAO::getFieldValue('CRM_Price_DAO_Set', $this->_priceSetId, 'is_quick_config')) {
$lineItemForTemplate = array();
foreach ($this->_lineItem as $key => $value) {
Expand Down
2 changes: 1 addition & 1 deletion CRM/Event/Form/Task/Batch.php
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ class CRM_Event_Form_Task_Batch extends CRM_Event_Form_Task {
*
* @return void
* @access public
*/
*/
function preProcess() {
/*
* initialize the task and row fields
Expand Down
2 changes: 1 addition & 1 deletion CRM/Event/Form/Task/PickProfile.php
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ class CRM_Event_Form_Task_PickProfile extends CRM_Event_Form_Task {
*
* @return void
* @access public
*/
*/
function preProcess() {
/*
* initialize the task and row fields
Expand Down
2 changes: 1 addition & 1 deletion CRM/Event/Form/Task/SearchTaskHookSample.php
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ function preProcess() {
$query = "
SELECT p.fee_amount as amount,
p.register_date as register_date,
p.source as source,
p.source as source,
ct.display_name as display_name
FROM civicrm_participant p
INNER JOIN civicrm_contact ct ON ( p.contact_id = ct.id )
Expand Down
2 changes: 1 addition & 1 deletion CRM/Event/Import/Parser.php
Original file line number Diff line number Diff line change
Expand Up @@ -451,7 +451,7 @@ function setActiveFields($fieldKeys) {
$this->_activeFields[$i]->_hasLocationType = $elements[$i];
}
}
function setActiveFieldPhoneTypes( $elements )
{
for ($i = 0; $i < count( $elements ); $i++) {
Expand Down
6 changes: 3 additions & 3 deletions CRM/Event/Page/AJAX.php
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ function eventType() {
SELECT v.label ,v.value
FROM civicrm_option_value v,
civicrm_option_group g
WHERE v.option_group_id = g.id
WHERE v.option_group_id = g.id
AND g.name = 'event_type'
AND v.is_active = 1
AND {$whereClause}
Expand All @@ -102,14 +102,14 @@ function eventFee() {
}

$whereClause = "cv.label LIKE '$name%' ";

$query = "SELECT DISTINCT (
cv.label
), cv.id
FROM civicrm_price_field_value cv
LEFT JOIN civicrm_price_field cf ON cv.price_field_id = cf.id
LEFT JOIN civicrm_price_set_entity ce ON ce.price_set_id = cf.price_set_id
WHERE ce.entity_table = 'civicrm_event' AND {$whereClause}
WHERE ce.entity_table = 'civicrm_event' AND {$whereClause}
GROUP BY cv.label";
$dao = CRM_Core_DAO::executeQuery($query);
while ($dao->fetch()) {
Expand Down
4 changes: 2 additions & 2 deletions CRM/Event/Page/ParticipantListing/Simple.php
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ function run() {

$fromClause = "
FROM civicrm_contact
INNER JOIN civicrm_participant ON ( civicrm_contact.id = civicrm_participant.contact_id
AND civicrm_contact.is_deleted = 0 )
INNER JOIN civicrm_participant ON ( civicrm_contact.id = civicrm_participant.contact_id
AND civicrm_contact.is_deleted = 0 )
INNER JOIN civicrm_event ON civicrm_participant.event_id = civicrm_event.id
LEFT JOIN civicrm_email ON ( civicrm_contact.id = civicrm_email.contact_id AND civicrm_email.is_primary = 1 )
";
Expand Down
2 changes: 1 addition & 1 deletion CRM/Export/Form/Select.php
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ function preProcess() {
CRM_Case_Form_Task::preProcessCommon($this, TRUE);
$this->_exportMode = self::CASE_EXPORT;
$componentName = array('', 'Case');
break;
break;
}

$this->_task = $values['task'];
Expand Down
2 changes: 1 addition & 1 deletion CRM/Extension/Manager/Interface.php
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public function onPostEnable(CRM_Extension_Info $info);
/**
* Perform type-specific removal logic (before updating the extension
* row in the "civicrm_extension" table).
*
*
* @param CRM_Extension_Info $info may be generated from xml or DB (which is lossy)
* @see CRM_Extension_Manager::createInfoFromDB
*/
Expand Down
Loading

0 comments on commit 03e0400

Please sign in to comment.