From f813f78ee5bbec2338615b1973fc4bab4f11960f Mon Sep 17 00:00:00 2001 From: eileen Date: Tue, 28 May 2013 15:24:29 +1200 Subject: [PATCH] a few more trailing space removals, //ids removals, tabs --- CRM/ACL/API.php | 2 - CRM/ACL/BAO/ACL.php | 2 - CRM/ACL/BAO/Cache.php | 2 - CRM/ACL/BAO/EntityRole.php | 2 - CRM/ACL/Form/ACL.php | 2 - CRM/ACL/Form/ACLBasic.php | 2 - CRM/ACL/Form/EntityRole.php | 2 - CRM/ACL/Page/ACL.php | 2 - CRM/ACL/Page/ACLBasic.php | 2 - CRM/ACL/Page/EntityRole.php | 2 - CRM/Activity/BAO/ActivityAssignment.php | 2 +- CRM/Activity/BAO/ActivityTarget.php | 2 +- CRM/Activity/BAO/ICalendar.php | 14 ++-- CRM/Activity/BAO/Query.php | 2 +- CRM/Activity/Form/Task/FileOnCase.php | 2 +- CRM/Activity/Form/Task/PickOption.php | 6 +- CRM/Activity/Form/Task/PickProfile.php | 2 +- .../Form/Task/SearchTaskHookSample.php | 6 +- CRM/Activity/Import/Parser.php | 2 +- CRM/Activity/Page/AJAX.php | 2 +- CRM/Activity/Selector/Search.php | 2 +- CRM/Admin/Form/Job.php | 4 +- CRM/Admin/Form/Setting/Mail.php | 8 +-- CRM/Contact/DAO/Factory.php | 1 - CRM/Contact/Task.php | 2 - CRM/Contribute/BAO/Contribution.php | 2 - CRM/Contribute/BAO/Contribution/Utils.php | 2 +- CRM/Core/BAO/Address.php | 2 - CRM/Report/Form.php | 2 - CRM/Report/Form/Activity.php | 12 ++-- CRM/Report/Form/Campaign/SurveyDetails.php | 68 +++++++++---------- CRM/Report/Form/Contact/Detail.php | 12 ++-- CRM/Report/Form/Contact/LoggingSummary.php | 28 ++++---- CRM/Report/Form/Contribute/Detail.php | 34 +++++----- CRM/Report/Form/Contribute/Lybunt.php | 8 +-- CRM/Report/Form/Contribute/SoftCredit.php | 46 ++++++------- CRM/Report/Form/Contribute/Summary.php | 48 +++++++------ CRM/Report/Form/Contribute/Sybunt.php | 10 ++- .../Form/Event/ParticipantListCount.php | 28 ++++---- CRM/Report/Form/Event/ParticipantListing.php | 56 ++++++++------- CRM/Report/Form/Instance.php | 8 +-- CRM/Report/Form/Member/Detail.php | 60 ++++++++-------- CRM/Report/Form/Member/Lapse.php | 26 ++++--- CRM/Report/Form/Member/Summary.php | 36 +++++----- CRM/Report/Form/Pledge/Detail.php | 2 - CRM/Report/Form/Pledge/Pbnp.php | 6 +- CRM/Report/Info.php | 2 - CRM/SMS/BAO/Provider.php | 2 +- .../event_online_receipt_html.tpl | 44 ++++++------ .../event_online_receipt_text.tpl | 6 +- CRM/Upgrade/Incremental/php/FourTwo.php | 4 +- CRM/Upgrade/Incremental/sql/4.3.3.mysql.tpl | 2 +- CRM/Utils/Cache/SqlGroup.php | 2 +- CRM/Utils/DeprecatedUtils.php | 2 - CRM/Utils/Migrate/ExportJSON.php | 4 +- CRM/Utils/REST.php | 4 +- CRM/Utils/System/Joomla.php | 2 +- .../Campaign/Page/Petition/SocialNetwork.tpl | 2 +- templates/CRM/Case/Form/Case.hlp | 2 +- templates/CRM/Case/Form/CustomData.tpl | 2 +- .../Case/Form/Search/AdvancedSearchPane.tpl | 2 +- templates/CRM/Case/Form/Task.tpl | 2 +- templates/CRM/Case/Form/Task/Delete.tpl | 2 +- templates/CRM/common/Filter.tpl | 2 +- templates/CRM/common/SectionNav.tpl | 2 +- templates/CRM/common/SocialNetwork.tpl | 6 +- templates/CRM/common/batchCopy.tpl | 2 +- templates/CRM/common/commonCSS.tpl | 2 +- templates/CRM/common/dashboard.tpl | 12 ++-- templates/CRM/common/debug.tpl | 6 +- .../CRM/common/displaySearchCriteria.tpl | 2 +- templates/CRM/common/formButtons.tpl | 2 +- templates/CRM/common/overlay.tpl | 6 +- templates/CRM/common/pager.tpl | 10 +-- templates/CRM/common/searchResultTasks.tpl | 2 +- templates/CRM/common/showHideByFieldValue.tpl | 2 +- templates/CRM/common/stateCountry.tpl | 26 +++---- tests/phpunit/api/v3/RelationshipTest.php | 2 - xml/schema/Campaign/Campaign.xml | 66 +++++++++--------- xml/schema/Campaign/Survey.xml | 68 +++++++++---------- 80 files changed, 405 insertions(+), 472 deletions(-) diff --git a/CRM/ACL/API.php b/CRM/ACL/API.php index d470c80bca..d407a0371f 100644 --- a/CRM/ACL/API.php +++ b/CRM/ACL/API.php @@ -1,6 +1,4 @@ copyValues($params); $target->record_type_id = $targetID ; return $target->save(); diff --git a/CRM/Activity/BAO/ICalendar.php b/CRM/Activity/BAO/ICalendar.php index e0f7c5192e..568dc8ae67 100644 --- a/CRM/Activity/BAO/ICalendar.php +++ b/CRM/Activity/BAO/ICalendar.php @@ -55,7 +55,7 @@ class CRM_Activity_BAO_ICalendar { function __construct( &$act ) { $this->activity = $act; } - + /** * Add an ics attachment to the input array * @@ -74,18 +74,18 @@ class CRM_Activity_BAO_ICalendar { rename( $this->icsfile, $this->icsfile . '.ics' ); $this->icsfile .= '.ics'; $icsFileName = basename( $this->icsfile ); - + // get logged in user's primary email // TODO: Is there a better way to do this? $organizer = $this->getPrimaryEmail(); - + $template = CRM_Core_Smarty::singleton(); $template->assign('activity', $this->activity); $template->assign('organizer', $organizer); $template->assign('contacts', $contacts); $template->assign('timezone', date_default_timezone_get()); $calendar = $template->fetch('CRM/Activity/Calendar/ICal.tpl'); - if ( file_put_contents( $this->icsfile, $calendar ) !== FALSE ) { + if ( file_put_contents( $this->icsfile, $calendar ) !== FALSE ) { if ( empty( $attachments ) ) { $attachments = array(); } @@ -101,13 +101,13 @@ class CRM_Activity_BAO_ICalendar { } return null; } - + function cleanup() { if ( !empty ( $this->icsfile ) ) { @unlink( $this->icsfile ); } } - + // TODO: Is there a better way to do this? private function getPrimaryEmail() { $session = &CRM_Core_Session::singleton(); @@ -121,7 +121,7 @@ class CRM_Activity_BAO_ICalendar { break; } } - + if ( count($emails) == 1 ) { $primary = $e['email']; break; diff --git a/CRM/Activity/BAO/Query.php b/CRM/Activity/BAO/Query.php index 7785a3672f..f251f70c26 100644 --- a/CRM/Activity/BAO/Query.php +++ b/CRM/Activity/BAO/Query.php @@ -235,7 +235,7 @@ class CRM_Activity_BAO_Query { $sourceID = CRM_Utils_Array::key('Activity Source', $activityContacts); $assigneeID = CRM_Utils_Array::key('Activity Assignees', $activityContacts); $targetID = CRM_Utils_Array::key('Activity Targets', $activityContacts); - + if ($values[2]) { $query->_tables['civicrm_activity_contact'] = $query->_whereTables['civicrm_activity_contact'] = 1; if ($values[2] == 1) { diff --git a/CRM/Activity/Form/Task/FileOnCase.php b/CRM/Activity/Form/Task/FileOnCase.php index ff8a35033f..3f1f881ada 100644 --- a/CRM/Activity/Form/Task/FileOnCase.php +++ b/CRM/Activity/Form/Task/FileOnCase.php @@ -169,7 +169,7 @@ class CRM_Activity_Form_Task_FileOnCase extends CRM_Activity_Form_Task { else { CRM_Core_Session::setStatus(ts('Not permitted to file activity %1 %2.', array( 1 => empty($defaults['subject']) ? '' : $defaults['subject'], - 2 => $defaults['activity_date_time'])), + 2 => $defaults['activity_date_time'])), ts("Error"), "error"); } } diff --git a/CRM/Activity/Form/Task/PickOption.php b/CRM/Activity/Form/Task/PickOption.php index 73a9ffbd7d..86d81431b1 100644 --- a/CRM/Activity/Form/Task/PickOption.php +++ b/CRM/Activity/Form/Task/PickOption.php @@ -73,7 +73,7 @@ class CRM_Activity_Form_Task_PickOption extends CRM_Activity_Form_Task { /* * initialize the task and row fields */ - + parent::preProcess(); $session = CRM_Core_Session::singleton(); $this->_userContext = $session->readUserContext(); @@ -149,10 +149,10 @@ class CRM_Activity_Form_Task_PickOption extends CRM_Activity_Form_Task { $this->controller->resetPage('Email'); $params = $this->exportValues(); $this->_contacts = array(); - + $activityContacts = CRM_Core_PseudoConstant::activityContacts('name'); $assigneeID = CRM_Utils_Array::key('Activity Assignees', $activityContacts); - $targetID = CRM_Utils_Array::key('Activity Targets', $activityContacts); + $targetID = CRM_Utils_Array::key('Activity Targets', $activityContacts); //get assignee contacts if (!empty($params['assigned_to'])) { foreach ($this->_activityHolderIds as $key => $id) { diff --git a/CRM/Activity/Form/Task/PickProfile.php b/CRM/Activity/Form/Task/PickProfile.php index 2ca7ada305..4cbfe731d4 100755 --- a/CRM/Activity/Form/Task/PickProfile.php +++ b/CRM/Activity/Form/Task/PickProfile.php @@ -67,7 +67,7 @@ class CRM_Activity_Form_Task_PickProfile extends CRM_Activity_Form_Task { /* * initialize the task and row fields */ - + parent::preProcess(); $session = CRM_Core_Session::singleton(); $this->_userContext = $session->readUserContext(); diff --git a/CRM/Activity/Form/Task/SearchTaskHookSample.php b/CRM/Activity/Form/Task/SearchTaskHookSample.php index 04589056e5..25962a414b 100644 --- a/CRM/Activity/Form/Task/SearchTaskHookSample.php +++ b/CRM/Activity/Form/Task/SearchTaskHookSample.php @@ -52,12 +52,12 @@ class CRM_Activity_Form_Task_SearchTaskHookSample extends CRM_Activity_Form_Task $query = " SELECT at.subject as subject, ov.label as activity_type, - at.activity_date_time as activity_date, + at.activity_date_time as activity_date, ct.display_name as display_name FROM civicrm_activity at -INNER JOIN civicrm_contact ct ON ( at.source_contact_id = ct.id ) +INNER JOIN civicrm_contact ct ON ( at.source_contact_id = ct.id ) LEFT JOIN civicrm_option_group og ON ( og.name = 'activity_type' ) - LEFT JOIN civicrm_option_value ov ON (at.activity_type_id = ov.value AND og.id = ov.option_group_id ) + LEFT JOIN civicrm_option_value ov ON (at.activity_type_id = ov.value AND og.id = ov.option_group_id ) WHERE at.id IN ( $activityIDs )"; $dao = CRM_Core_DAO::executeQuery($query, diff --git a/CRM/Activity/Import/Parser.php b/CRM/Activity/Import/Parser.php index 4b9e93a7e1..705b397220 100644 --- a/CRM/Activity/Import/Parser.php +++ b/CRM/Activity/Import/Parser.php @@ -193,7 +193,7 @@ abstract class CRM_Activity_Import_Parser { * @var boolean */ protected $_haveColumnHeader; - + function __construct() { $this->_maxLinesToProcess = 0; $this->_maxErrorCount = self::MAX_ERRORS; diff --git a/CRM/Activity/Page/AJAX.php b/CRM/Activity/Page/AJAX.php index f20cc038f0..75b235dd25 100644 --- a/CRM/Activity/Page/AJAX.php +++ b/CRM/Activity/Page/AJAX.php @@ -361,7 +361,7 @@ class CRM_Activity_Page_AJAX { if (!empty($params['targetContactIds'])) { $targetContacts = array_unique(explode(',', $params['targetContactIds'])); } - + $activityContacts = CRM_Core_PseudoConstant::activityContacts('name'); $sourceID = CRM_Utils_Array::key('Activity Source', $activityContacts); $assigneeID = CRM_Utils_Array::key('Activity Assignees', $activityContacts); diff --git a/CRM/Activity/Selector/Search.php b/CRM/Activity/Selector/Search.php index 8d35861760..eb0d951991 100644 --- a/CRM/Activity/Selector/Search.php +++ b/CRM/Activity/Selector/Search.php @@ -253,7 +253,7 @@ class CRM_Activity_Selector_Search extends CRM_Core_Selector_Base implements CRM $sourceID = CRM_Utils_Array::key('Activity Source', $activityContacts); $assigneeID = CRM_Utils_Array::key('Activity Assignees', $activityContacts); $targetID = CRM_Utils_Array::key('Activity Targets', $activityContacts); - + while ($result->fetch()) { $row = array(); diff --git a/CRM/Admin/Form/Job.php b/CRM/Admin/Form/Job.php index ddd4b2bf25..ec888d28bc 100644 --- a/CRM/Admin/Form/Job.php +++ b/CRM/Admin/Form/Job.php @@ -191,7 +191,7 @@ class CRM_Admin_Form_Job extends CRM_Admin_Form { $dao->is_active = CRM_Utils_Array::value('is_active', $values, 0); $dao->save(); - + // CRM-11143 - Give warning message if update_greetings is Enabled (is_active) since it generally should not be run automatically via execute action or runjobs url. if ($values['api_action'] == 'update_greeting' && CRM_Utils_Array::value('is_active', $values) == 1) { // pass "wiki" as 6th param to docURL2 if you are linking to a page in wiki.civicrm.org @@ -200,7 +200,7 @@ class CRM_Admin_Form_Job extends CRM_Admin_Form { CRM_Core_Session::setStatus($msg, ts('Warning: Update Greeting job enabled'), 'alert'); } - + } //end of function } diff --git a/CRM/Admin/Form/Setting/Mail.php b/CRM/Admin/Form/Setting/Mail.php index 82f9f26c19..cdcb361b7f 100644 --- a/CRM/Admin/Form/Setting/Mail.php +++ b/CRM/Admin/Form/Setting/Mail.php @@ -57,16 +57,16 @@ class CRM_Admin_Form_Setting_Mail extends CRM_Admin_Form_Setting { // redirect to Administer Section After hitting either Save or Cancel button. $session = CRM_Core_Session::singleton(); $session->pushUserContext(CRM_Utils_System::url('civicrm/admin', 'reset=1')); - + $this->addFormRule(array('CRM_Admin_Form_Setting_Mail', 'formRule')); $this->addRule('mailerBatchLimit', ts('Must be an integer'), 'integer'); $this->addRule('mailThrottleTime', ts('Must be an integer'), 'integer'); $this->addRule('mailerJobSize', ts('Must be an integer'), 'integer'); - $this->addRule('mailerJobsMax', ts('Must be an integer'), 'integer'); + $this->addRule('mailerJobsMax', ts('Must be an integer'), 'integer'); parent::buildQuickForm($check); } - + static function formRule($fields) { $errors = array(); @@ -79,7 +79,7 @@ class CRM_Admin_Form_Setting_Mail extends CRM_Admin_Form_Setting { $errors['mailerJobSize'] = ts('A job size smaller than the batch limit will negate the effect of the batch limit.'); } } - + return empty($errors) ? TRUE : $errors; } } diff --git a/CRM/Contact/DAO/Factory.php b/CRM/Contact/DAO/Factory.php index 233a78356e..d4b89050ef 100644 --- a/CRM/Contact/DAO/Factory.php +++ b/CRM/Contact/DAO/Factory.php @@ -1,5 +1,4 @@ fiscalYearStart) && ($config->fiscalYearStart['M'] != 1 || $config->fiscalYearStart['d'] != 1)) { $yearClause = "CASE WHEN (MONTH(contrib.receive_date)>= " . $config->fiscalYearStart['M'] . " - && DAYOFMONTH(contrib.receive_date)>= " . $config->fiscalYearStart['d'] . " ) + && DAYOFMONTH(contrib.receive_date)>= " . $config->fiscalYearStart['d'] . " ) THEN concat(YEAR(contrib.receive_date), '-',YEAR(contrib.receive_date)+1) ELSE diff --git a/CRM/Core/BAO/Address.php b/CRM/Core/BAO/Address.php index 94115311a5..09d98d3a14 100644 --- a/CRM/Core/BAO/Address.php +++ b/CRM/Core/BAO/Address.php @@ -1,6 +1,4 @@ _aliases['civicrm_activity']} LEFT JOIN civicrm_activity_contact {$this->_aliases['civicrm_activity_target']} - ON {$this->_aliases['civicrm_activity']}.id = {$this->_aliases['civicrm_activity_target']}.activity_id AND + ON {$this->_aliases['civicrm_activity']}.id = {$this->_aliases['civicrm_activity_target']}.activity_id AND {$this->_aliases['civicrm_activity_target']}.record_type_id = {$targetID} LEFT JOIN civicrm_activity_contact {$this->_aliases['civicrm_activity_assignment']} - ON {$this->_aliases['civicrm_activity']}.id = {$this->_aliases['civicrm_activity_assignment']}.activity_id AND - {$this->_aliases['civicrm_activity_assignment']}.record_type_id = {$assigneeID} + ON {$this->_aliases['civicrm_activity']}.id = {$this->_aliases['civicrm_activity_assignment']}.activity_id AND + {$this->_aliases['civicrm_activity_assignment']}.record_type_id = {$assigneeID} LEFT JOIN civicrm_contact civicrm_contact_source ON {$this->_aliases['civicrm_activity']}.source_contact_id = civicrm_contact_source.id LEFT JOIN civicrm_contact contact_civireport @@ -639,8 +637,8 @@ class CRM_Report_Form_Activity extends CRM_Report_Form { } } } - - + + /* * Add Target Contact Address into From Table if required */ diff --git a/CRM/Report/Form/Campaign/SurveyDetails.php b/CRM/Report/Form/Campaign/SurveyDetails.php index 14197ffe77..44bc492320 100644 --- a/CRM/Report/Form/Campaign/SurveyDetails.php +++ b/CRM/Report/Form/Campaign/SurveyDetails.php @@ -1,6 +1,4 @@ + 'order_bys' => array('street_name' => array('title' => ts('Street Name')), - 'street_number_odd_even' => + 'street_number_odd_even' => array('title' => ts('Odd / Even Street Number'), 'name' =>'street_number', 'dbAlias' => 'address_civireport.street_number%2', ), - 'street_number' => array('title' => 'Street Number'), + 'street_number' => array('title' => 'Street Number'), ), 'grouping' => 'location-fields', ), @@ -257,7 +255,7 @@ class CRM_Report_Form_Campaign_SurveyDetails extends CRM_Report_Form { 'operatorType' => CRM_Report_Form::OP_SELECT, 'options' => $responseStatus, ), - 'result' => + 'result' => array( 'title' => ts('Survey Result'), 'type' => CRM_Utils_Type::T_STRING, @@ -274,13 +272,13 @@ class CRM_Report_Form_Campaign_SurveyDetails extends CRM_Report_Form { function preProcess() { parent::preProcess(); } - + function select() { $select = array(); - + //add the survey response fields. $this->_addSurveyResponseColumns(); - + $this->_columnHeaders = array(); foreach ($this->_columns as $tableName => $table) { if (!isset($table['fields'])) { @@ -318,24 +316,24 @@ class CRM_Report_Form_Campaign_SurveyDetails extends CRM_Report_Form { $targetID = CRM_Utils_Array::key('Activity Targets', $activityContacts); //get the activity table joins. - $this->_from .= " INNER JOIN civicrm_activity_contact civicrm_activity_target ON + $this->_from .= " INNER JOIN civicrm_activity_contact civicrm_activity_target ON ( {$this->_aliases['civicrm_contact']}.id = civicrm_activity_target.contact_id AND civicrm_activity_target.record_type_id = {$targetID}) \n"; - $this->_from .= " INNER JOIN civicrm_activity {$this->_aliases['civicrm_activity']} ON + $this->_from .= " INNER JOIN civicrm_activity {$this->_aliases['civicrm_activity']} ON ( {$this->_aliases['civicrm_activity']}.id = civicrm_activity_target.activity_id )\n"; - $this->_from .= " INNER JOIN civicrm_activity_contact civicrm_activity_assignment ON + $this->_from .= " INNER JOIN civicrm_activity_contact civicrm_activity_assignment ON ( {$this->_aliases['civicrm_activity']}.id = civicrm_activity_assignment.activity_id AND civicrm_activity_assignment.record_type_id = {$assigneeID} )\n"; //get the address table. - $this->_from .= " LEFT JOIN civicrm_address {$this->_aliases['civicrm_address']} ON + $this->_from .= " LEFT JOIN civicrm_address {$this->_aliases['civicrm_address']} ON {$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_address']}.contact_id AND {$this->_aliases['civicrm_address']}.is_primary = 1\n"; if ($this->_emailField) { - $this->_from .= "LEFT JOIN civicrm_email {$this->_aliases['civicrm_email']} ON + $this->_from .= "LEFT JOIN civicrm_email {$this->_aliases['civicrm_email']} ON {$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_email']}.contact_id AND {$this->_aliases['civicrm_email']}.is_primary = 1\n"; } if ($this->_phoneField) { - $this->_from .= "LEFT JOIN civicrm_phone {$this->_aliases['civicrm_phone']} ON + $this->_from .= "LEFT JOIN civicrm_phone {$this->_aliases['civicrm_phone']} ON {$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_phone']}.contact_id AND {$this->_aliases['civicrm_phone']}.is_primary = 1\n"; } @@ -348,7 +346,7 @@ class CRM_Report_Form_Campaign_SurveyDetails extends CRM_Report_Form { } } } - + function where() { $clauses = array(); foreach ($this->_columns as $tableName => $table) { @@ -434,7 +432,7 @@ class CRM_Report_Form_Campaign_SurveyDetails extends CRM_Report_Form { ) { $orderByStreetName = CRM_Utils_Array::value('street_name', $orderBys); $orderByStreetNum = CRM_Utils_Array::value('street_number', $orderBys); - + $pageCnt = 0; $dataPerPage = array(); $lastStreetName = $lastStreetNum = NULL; @@ -452,13 +450,13 @@ class CRM_Report_Form_Campaign_SurveyDetails extends CRM_Report_Form { ) { $pageCnt++; } - + //get the data per page. $dataPerPage[$pageCnt][] = $row; $lastStreetName = CRM_Utils_Array::value('civicrm_address_street_name', $row); $lastStreetNum = CRM_Utils_Array::value('civicrm_address_street_number', $row) % 2; } - + foreach ($dataPerPage as $page) { // assign variables to templates $this->doTemplateAssignment($page); @@ -495,7 +493,7 @@ class CRM_Report_Form_Campaign_SurveyDetails extends CRM_Report_Form { $this->doTemplateAssignment($rows); $this->endPostProcess($rows); } - + } private function _surveyCoverSheet() { @@ -551,7 +549,7 @@ INNER JOIN civicrm_option_value val ON ( val.option_group_id = field.option_gro val.label as label, val.value as value FROM civicrm_survey survey -INNER JOIN civicrm_option_value val ON ( val.option_group_id = survey.result_id ) +INNER JOIN civicrm_option_value val ON ( val.option_group_id = survey.result_id ) WHERE survey.id IN ( ' . implode(' , ', array_values($surveyIds)) . ' ) Order By val.weight'; $resultSet = CRM_Core_DAO::executeQuery($query); @@ -647,11 +645,11 @@ INNER JOIN civicrm_option_value val ON ( val.option_group_id = survey.result_id //swap the survey result label w/ value. $query = ' SELECT survey.id as id, - val.label as label, + val.label as label, val.value as value FROM civicrm_option_value val INNER JOIN civicrm_option_group grp ON ( grp.id = val.option_group_id ) -INNER JOIN civicrm_survey survey ON ( survey.result_id = grp.id ) +INNER JOIN civicrm_survey survey ON ( survey.result_id = grp.id ) WHERE survey.id IN (' . implode(' , ', array_values($surveyIds)) . ' ) Order By val.weight'; @@ -731,16 +729,16 @@ INNER JOIN civicrm_survey survey ON ( survey.result_id = grp.id ) } //start response data formatting. - $query = ' + $query = ' SELECT cf.id, cf.data_type, cf.html_type, - cg.table_name, + cg.table_name, cf.column_name, ov.value, ov.label, cf.option_group_id - FROM civicrm_custom_field cf -INNER JOIN civicrm_custom_group cg ON ( cg.id = cf.custom_group_id ) + FROM civicrm_custom_field cf +INNER JOIN civicrm_custom_group cg ON ( cg.id = cf.custom_group_id ) LEFT JOIN civicrm_option_value ov ON ( cf.option_group_id = ov.option_group_id ) WHERE cf.id IN ( ' . implode(' , ', $surveyResponseFieldIds) . ' ) Order By ov.weight'; @@ -821,10 +819,10 @@ INNER JOIN civicrm_custom_group cg ON ( cg.id = cf.custom_group_id ) foreach($responseFields as $key => $value){ if(substr($key,0,5) == 'phone' && CRM_Utils_Array::value('location_type_id',$value)){ $fName = str_replace('-','_',$key); - $this->_columns["civicrm_{$fName}"] = + $this->_columns["civicrm_{$fName}"] = array( 'dao' => 'CRM_Core_DAO_Phone', 'alias' => "phone_civireport_{$fName}", - 'fields' => + 'fields' => array( $fName => array_merge($value, array( 'is_required' => '1', 'alias' => "phone_civireport_{$fName}", 'dbAlias' => "phone_civireport_{$fName}.phone", 'no_display' => TRUE, @@ -848,15 +846,15 @@ INNER JOIN civicrm_custom_group cg ON ( cg.id = cf.custom_group_id ) } $query = ' - SELECT cg.extends, - cf.data_type, - cf.html_type, - cg.table_name, + SELECT cg.extends, + cf.data_type, + cf.html_type, + cg.table_name, cf.column_name, cf.time_format, cf.id as cfId, cf.option_group_id - FROM civicrm_custom_group cg + FROM civicrm_custom_group cg INNER JOIN civicrm_custom_field cf ON ( cg.id = cf.custom_group_id ) WHERE cf.id IN ( ' . implode(' , ', $responseFieldIds) . ' ) ORDER BY cf.weight'; $response = CRM_Core_DAO::executeQuery($query); @@ -864,7 +862,7 @@ INNER JOIN civicrm_custom_field cf ON ( cg.id = cf.custom_group_id ) while ($response->fetch()) { $resTable = $response->table_name; $fieldName = "custom_{$response->cfId}"; - + //need to check does these custom data already included. if (!array_key_exists($resTable, $this->_columns)) { diff --git a/CRM/Report/Form/Contact/Detail.php b/CRM/Report/Form/Contact/Detail.php index 36fa06bc0d..0804bbaf3a 100644 --- a/CRM/Report/Form/Contact/Detail.php +++ b/CRM/Report/Form/Contact/Detail.php @@ -1,6 +1,4 @@ TRUE, 'no_repeat' => TRUE, ), - 'first_name' => array('title' => ts('First Name'), + 'first_name' => array('title' => ts('First Name'), ), - 'last_name' => array('title' => ts('Last Name'), + 'last_name' => array('title' => ts('Last Name'), ), 'id' => array( @@ -474,14 +472,14 @@ class CRM_Report_Form_Contact_Detail extends CRM_Report_Form { $activityContacts = CRM_Core_PseudoConstant::activityContacts('name'); $assigneeID = CRM_Utils_Array::key('Activity Assignees', $activityContacts); $targetID = CRM_Utils_Array::key('Activity Targets', $activityContacts); - + $this->_formComponent['activity_civireport'] = "FROM civicrm_activity {$this->_aliases['civicrm_activity']} LEFT JOIN civicrm_activity_contact civicrm_activity_target ON {$this->_aliases['civicrm_activity']}.id = civicrm_activity_target.activity_id AND civicrm_activity_target.record_type_id = {$targetID} LEFT JOIN civicrm_activity_contact civicrm_activity_assignment ON - {$this->_aliases['civicrm_activity']}.id = civicrm_activity_assignment.activity_id AND civicrm_activity_assignment.record_type_id = {$assigneeID} + {$this->_aliases['civicrm_activity']}.id = civicrm_activity_assignment.activity_id AND civicrm_activity_assignment.record_type_id = {$assigneeID} LEFT JOIN civicrm_contact sourceContact ON {$this->_aliases['civicrm_activity']}.source_contact_id = sourceContact.id LEFT JOIN civicrm_contact {$this->_aliases['civicrm_activity_target']} ON @@ -802,7 +800,7 @@ class CRM_Report_Form_Contact_Detail extends CRM_Report_Form { // handle contribution if ($component == 'contribution_civireport') { if ($val = CRM_Utils_Array::value('civicrm_contribution_financial_type_id', $row)) { - $componentRows[$contactID][$component][$rowNum]['civicrm_contribution_financial_type_id'] = + $componentRows[$contactID][$component][$rowNum]['civicrm_contribution_financial_type_id'] = CRM_Contribute_PseudoConstant::financialType($val, false); } diff --git a/CRM/Report/Form/Contact/LoggingSummary.php b/CRM/Report/Form/Contact/LoggingSummary.php index 368128dbf8..bf997fb884 100644 --- a/CRM/Report/Form/Contact/LoggingSummary.php +++ b/CRM/Report/Form/Contact/LoggingSummary.php @@ -1,6 +1,4 @@ &$row) { if (!isset($isDeleted[$row['log_civicrm_entity_altered_contact_id']])) { - $isDeleted[$row['log_civicrm_entity_altered_contact_id']] = + $isDeleted[$row['log_civicrm_entity_altered_contact_id']] = CRM_Core_DAO::getFieldValue('CRM_Contact_DAO_Contact', $row['log_civicrm_entity_altered_contact_id'], 'is_deleted') !== '0'; } - if (CRM_Utils_Array::value('log_civicrm_entity_altered_contact', $row) && + if (CRM_Utils_Array::value('log_civicrm_entity_altered_contact', $row) && !$isDeleted[$row['log_civicrm_entity_altered_contact_id']]) { - $row['log_civicrm_entity_altered_contact_link'] = + $row['log_civicrm_entity_altered_contact_link'] = CRM_Utils_System::url('civicrm/contact/view', 'reset=1&cid=' . $row['log_civicrm_entity_altered_contact_id']); $row['log_civicrm_entity_altered_contact_hover'] = ts("Go to contact summary"); $entity = $this->getEntityValue($row['log_civicrm_entity_id'], $row['log_civicrm_entity_log_type'], $row['log_civicrm_entity_log_date']); @@ -178,13 +176,13 @@ class CRM_Report_Form_Contact_LoggingSummary extends CRM_Logging_ReportSummary { $row['log_civicrm_entity_log_action'] = ts('Delete (to trash)'); } - if ('Contact' == CRM_Utils_Array::value('log_type', $this->_logTables[$row['log_civicrm_entity_log_type']]) && + if ('Contact' == CRM_Utils_Array::value('log_type', $this->_logTables[$row['log_civicrm_entity_log_type']]) && CRM_Utils_Array::value('log_civicrm_entity_log_action', $row) == 'Insert' ) { $row['log_civicrm_entity_log_action'] = ts('Update'); } - if ($newAction = $this->getEntityAction($row['log_civicrm_entity_id'], - $row['log_civicrm_entity_log_conn_id'], + if ($newAction = $this->getEntityAction($row['log_civicrm_entity_id'], + $row['log_civicrm_entity_log_conn_id'], $row['log_civicrm_entity_log_type'], CRM_Utils_Array::value('log_civicrm_entity_log_action', $row))) $row['log_civicrm_entity_log_action'] = $newAction; @@ -204,9 +202,9 @@ class CRM_Report_Form_Contact_LoggingSummary extends CRM_Logging_ReportSummary { $row['log_civicrm_entity_log_action'] = "
 " . ts('Update') . ''; } - $key = $date . '_' . - $row['log_civicrm_entity_log_type'] . '_' . - $row['log_civicrm_entity_log_conn_id'] . '_' . + $key = $date . '_' . + $row['log_civicrm_entity_log_type'] . '_' . + $row['log_civicrm_entity_log_conn_id'] . '_' . $row['log_civicrm_entity_log_user_id'] . '_' . $row['log_civicrm_entity_id']; $newRows[$key] = $row; @@ -229,9 +227,9 @@ class CRM_Report_Form_Contact_LoggingSummary extends CRM_Logging_ReportSummary { $tableName = CRM_Utils_Array::value('table_name', $detail, $entity); $clause = CRM_Utils_Array::value('entity_table', $detail); $clause = $clause ? "AND entity_log_civireport.entity_table = 'civicrm_contact'" : null; - + $joinClause = " -INNER JOIN civicrm_contact modified_contact_civireport +INNER JOIN civicrm_contact modified_contact_civireport ON (entity_log_civireport.{$detail['fk']} = modified_contact_civireport.id {$clause})"; if (CRM_Utils_Array::value('joins', $detail)) { @@ -239,14 +237,14 @@ INNER JOIN civicrm_contact modified_contact_civireport $clause = $clause ? "AND fk_table.entity_table = 'civicrm_contact'" : null; $joinClause = " INNER JOIN `{$this->loggingDB}`.{$detail['joins']['table']} fk_table ON {$detail['joins']['join']} -INNER JOIN civicrm_contact modified_contact_civireport +INNER JOIN civicrm_contact modified_contact_civireport ON (fk_table.{$detail['fk']} = modified_contact_civireport.id {$clause})"; } $this->_from = " FROM `{$this->loggingDB}`.$tableName entity_log_civireport {$joinClause} -LEFT JOIN civicrm_contact altered_by_contact_civireport +LEFT JOIN civicrm_contact altered_by_contact_civireport ON (entity_log_civireport.log_user_id = altered_by_contact_civireport.id)"; } } diff --git a/CRM/Report/Form/Contribute/Detail.php b/CRM/Report/Form/Contribute/Detail.php index f6e5f5bbd2..6550a5b7be 100644 --- a/CRM/Report/Form/Contribute/Detail.php +++ b/CRM/Report/Form/Contribute/Detail.php @@ -1,6 +1,4 @@ enableComponents); if ($campaignEnabled) { @@ -67,9 +65,9 @@ class CRM_Report_Form_Contribute_Detail extends CRM_Report_Form { array('title' => ts('Donor Name'), 'required' => TRUE, ), - 'first_name' => array('title' => ts('First Name'), + 'first_name' => array('title' => ts('First Name'), ), - 'last_name' => array('title' => ts('Last Name'), + 'last_name' => array('title' => ts('Last Name'), ), 'id' => array( @@ -174,15 +172,15 @@ class CRM_Report_Form_Contribute_Detail extends CRM_Report_Form { 'name' => 'id', 'title' => ts('Contribution ID'), ), - 'contribution_or_soft' => + 'contribution_or_soft' => array('title' => ts('Contribution OR Soft Credit?'), 'dbAlias' => "'Contribution'" ), - 'soft_credits' => + 'soft_credits' => array('title' => ts('Soft Credits'), 'dbAlias' => "NULL" ), - 'soft_credit_for' => + 'soft_credit_for' => array('title' => ts('Soft Credit For'), 'dbAlias' => "NULL" ), @@ -191,7 +189,7 @@ class CRM_Report_Form_Contribute_Detail extends CRM_Report_Form { ), 'contribution_status_id' => array('title' => ts('Contribution Status'), ), - 'source' => array('title' => ts('Source'), + 'source' => array('title' => ts('Source'), ), 'payment_instrument_id' => array('title' => ts('Payment Type'), ), @@ -336,7 +334,7 @@ class CRM_Report_Form_Contribute_Detail extends CRM_Report_Form { ); } - // If we have active campaigns add those elements to both the fields and filters + // If we have active campaigns add those elements to both the fields and filters if ($campaignEnabled && !empty($this->activeCampaigns)) { $this->_columns['civicrm_contribution']['fields']['campaign_id'] = array( 'title' => ts('Campaign'), @@ -564,8 +562,8 @@ SELECT COUNT(contribution_soft_civireport.amount ) as count, ROUND(AVG(contribution_soft_civireport.amount), 2) as avg, {$this->_aliases['civicrm_contribution']}.currency as currency"; $sql = " -{$select} -{$this->_softFrom} +{$select} +{$this->_softFrom} GROUP BY {$this->_aliases['civicrm_contribution']}.currency"; $dao = CRM_Core_DAO::executeQuery($sql); while ($dao->fetch()) { @@ -599,7 +597,7 @@ GROUP BY {$this->_aliases['civicrm_contribution']}.currency"; $this->buildACLClause($this->_aliases['civicrm_contact']); $this->beginPostProcess(); - + // 1. use main contribution query to build temp table 1 $sql = $this->buildQuery(); $tempQuery = 'CREATE TEMPORARY TABLE civireport_contribution_detail_temp1 AS ' . $sql; @@ -617,7 +615,7 @@ GROUP BY {$this->_aliases['civicrm_contribution']}.currency"; if (CRM_Utils_Array::value('include_set', $this->_params) == 'soft_credits_only') { // revise pager : prev, next based on soft-credits only $this->setPager(); - } + } // copy _from for later use of stats calculation for soft credits, and reset $this->_from to main query $this->_softFrom = $this->_from; @@ -781,14 +779,14 @@ UNION ALL array_key_exists('civicrm_contribution_contribution_id', $row) ) { $query = " -SELECT civicrm_contact_id, civicrm_contact_sort_name, civicrm_contribution_total_amount_sum, civicrm_contribution_currency +SELECT civicrm_contact_id, civicrm_contact_sort_name, civicrm_contribution_total_amount_sum, civicrm_contribution_currency FROM civireport_contribution_detail_temp2 WHERE civicrm_contribution_contribution_id={$row['civicrm_contribution_contribution_id']}"; $dao = CRM_Core_DAO::executeQuery($query); $string = ''; while ($dao->fetch()) { $url = CRM_Utils_System::url("civicrm/contact/view", 'reset=1&cid=' . $dao->civicrm_contact_id); - $string = $string . "\n{$dao->civicrm_contact_sort_name} " . + $string = $string . "\n{$dao->civicrm_contact_sort_name} " . CRM_Utils_Money::format($dao->civicrm_contribution_total_amount_sum, $dao->civicrm_contribution_currency); } $rows[$rowNum]['civicrm_contribution_soft_credits'] = $string; @@ -799,7 +797,7 @@ WHERE civicrm_contribution_contribution_id={$row['civicrm_contribution_contribu array_key_exists('civicrm_contribution_contribution_id', $row) ) { $query = " -SELECT civicrm_contact_id, civicrm_contact_sort_name +SELECT civicrm_contact_id, civicrm_contact_sort_name FROM civireport_contribution_detail_temp1 WHERE civicrm_contribution_contribution_id={$row['civicrm_contribution_contribution_id']}"; $dao = CRM_Core_DAO::executeQuery($query); diff --git a/CRM/Report/Form/Contribute/Lybunt.php b/CRM/Report/Form/Contribute/Lybunt.php index 8cd5416817..6017bc34a5 100644 --- a/CRM/Report/Form/Contribute/Lybunt.php +++ b/CRM/Report/Form/Contribute/Lybunt.php @@ -1,6 +1,4 @@ activeCampaigns = $getCampaigns['campaigns']; asort($this->activeCampaigns); - } + } $this->_columns = array( 'civicrm_contact' => @@ -77,9 +75,9 @@ class CRM_Report_Form_Contribute_Lybunt extends CRM_Report_Form { 'default' => TRUE, 'required' => TRUE, ), - 'first_name' => array('title' => ts('First Name'), + 'first_name' => array('title' => ts('First Name'), ), - 'last_name' => array('title' => ts('Last Name'), + 'last_name' => array('title' => ts('Last Name'), ), ), 'filters' => diff --git a/CRM/Report/Form/Contribute/SoftCredit.php b/CRM/Report/Form/Contribute/SoftCredit.php index ea25ca53c5..cd31594e58 100644 --- a/CRM/Report/Form/Contribute/SoftCredit.php +++ b/CRM/Report/Form/Contribute/SoftCredit.php @@ -1,6 +1,4 @@ 'Tabular', 'barChart' => 'Bar Chart', 'pieChart' => 'Pie Chart', - ); + ); public $_drilldownReport = array('contribute/detail' => 'Link to Detail Report'); - + function __construct() { // Check if CiviCampaign is a) enabled and b) has active campaigns @@ -56,7 +54,7 @@ class CRM_Report_Form_Contribute_SoftCredit extends CRM_Report_Form { $getCampaigns = CRM_Campaign_BAO_Campaign::getPermissionedCampaigns(NULL, NULL, TRUE, FALSE, TRUE); $this->activeCampaigns = $getCampaigns['campaigns']; asort($this->activeCampaigns); - } + } $this->_columns = array( 'civicrm_contact' => @@ -144,7 +142,7 @@ class CRM_Report_Form_Contribute_SoftCredit extends CRM_Report_Form { ), 'civicrm_financial_type' => array('dao' => 'CRM_Financial_DAO_FinancialType', - 'fields' => array('financial_type' => null,), + 'fields' => array('financial_type' => null,), 'filters' => array( 'id' => @@ -336,27 +334,27 @@ class CRM_Report_Form_Contribute_SoftCredit extends CRM_Report_Form { $alias_creditor = 'contact_civireport'; $this->_from = " FROM civicrm_contribution {$this->_aliases['civicrm_contribution']} - INNER JOIN civicrm_contribution_soft {$this->_aliases['civicrm_contribution_soft']} - ON {$this->_aliases['civicrm_contribution_soft']}.contribution_id = + INNER JOIN civicrm_contribution_soft {$this->_aliases['civicrm_contribution_soft']} + ON {$this->_aliases['civicrm_contribution_soft']}.contribution_id = {$this->_aliases['civicrm_contribution']}.id - INNER JOIN civicrm_contact {$alias_constituent} - ON {$this->_aliases['civicrm_contribution']}.contact_id = + INNER JOIN civicrm_contact {$alias_constituent} + ON {$this->_aliases['civicrm_contribution']}.contact_id = {$alias_constituent}.id - LEFT JOIN civicrm_financial_type {$this->_aliases['civicrm_financial_type']} - ON {$this->_aliases['civicrm_contribution']}.financial_type_id = + LEFT JOIN civicrm_financial_type {$this->_aliases['civicrm_financial_type']} + ON {$this->_aliases['civicrm_contribution']}.financial_type_id = {$this->_aliases['civicrm_financial_type']}.id LEFT JOIN civicrm_contact {$alias_creditor} - ON {$this->_aliases['civicrm_contribution_soft']}.contact_id = - {$alias_creditor}.id + ON {$this->_aliases['civicrm_contribution_soft']}.contact_id = + {$alias_creditor}.id {$this->_aclFrom} "; // include Constituent email field if email column is to be included if ($this->_emailField) { $alias = 'emailconst'; $this->_from .= " - LEFT JOIN civicrm_email {$alias} - ON {$alias_constituent}.id = - {$alias}.contact_id AND + LEFT JOIN civicrm_email {$alias} + ON {$alias_constituent}.id = + {$alias}.contact_id AND {$alias}.is_primary = 1\n"; } @@ -364,9 +362,9 @@ class CRM_Report_Form_Contribute_SoftCredit extends CRM_Report_Form { if ($this->_emailFieldCredit) { $alias = 'emailcredit'; $this->_from .= " - LEFT JOIN civicrm_email {$alias} - ON {$alias_creditor}.id = - {$alias}.contact_id AND + LEFT JOIN civicrm_email {$alias} + ON {$alias_creditor}.id = + {$alias}.contact_id AND {$alias}.is_primary = 1\n"; } @@ -374,8 +372,8 @@ class CRM_Report_Form_Contribute_SoftCredit extends CRM_Report_Form { if ($this->_phoneField) { $alias = 'pconst'; $this->_from .= " - LEFT JOIN civicrm_phone {$alias} - ON {$alias_constituent}.id = + LEFT JOIN civicrm_phone {$alias} + ON {$alias_constituent}.id = {$alias}.contact_id AND {$alias}.is_primary = 1\n"; } @@ -385,8 +383,8 @@ class CRM_Report_Form_Contribute_SoftCredit extends CRM_Report_Form { $alias = 'pcredit'; $this->_from .= " LEFT JOIN civicrm_phone pcredit - ON {$alias_creditor}.id = - {$alias}.contact_id AND + ON {$alias_creditor}.id = + {$alias}.contact_id AND {$alias}.is_primary = 1\n"; } } diff --git a/CRM/Report/Form/Contribute/Summary.php b/CRM/Report/Form/Contribute/Summary.php index e89d9be9c1..273c4bcf75 100644 --- a/CRM/Report/Form/Contribute/Summary.php +++ b/CRM/Report/Form/Contribute/Summary.php @@ -1,6 +1,4 @@ 'Pie Chart', ); protected $_customGroupExtends = array('Contribution'); - protected $_customGroupGroupBy = TRUE; + protected $_customGroupGroupBy = TRUE; public $_drilldownReport = array('contribute/detail' => 'Link to Detail Report'); function __construct() { - - // Check if CiviCampaign is a) enabled and b) has active campaigns - $config = CRM_Core_Config::singleton(); + + // Check if CiviCampaign is a) enabled and b) has active campaigns + $config = CRM_Core_Config::singleton(); $campaignEnabled = in_array("CiviCampaign", $config->enableComponents); if ($campaignEnabled) { $getCampaigns = CRM_Campaign_BAO_Campaign::getPermissionedCampaigns(NULL, NULL, TRUE, FALSE, TRUE); $this->activeCampaigns = $getCampaigns['campaigns']; asort($this->activeCampaigns); } - + $this->_columns = array( 'civicrm_contact' => array( @@ -112,11 +110,11 @@ class CRM_Report_Form_Contribute_Summary extends CRM_Report_Form { ), 'civicrm_financial_type' => array('dao' => 'CRM_Financial_DAO_FinancialType', - 'fields' => array('financial_type' => null,), + 'fields' => array('financial_type' => null,), 'grouping' => 'contri-fields', - 'group_bys' => array( - 'financial_type' => array('title' => ts('Financial Type')), - ), + 'group_bys' => array( + 'financial_type' => array('title' => ts('Financial Type')), + ), ), 'civicrm_contribution' => array( @@ -125,7 +123,7 @@ class CRM_Report_Form_Contribute_Summary extends CRM_Report_Form { 'fields' => array( 'contribution_source' => array('title' => ts('Source'), - ), + ), 'currency' => array('required' => TRUE, 'no_display' => TRUE, @@ -161,7 +159,7 @@ class CRM_Report_Form_Contribute_Summary extends CRM_Report_Form { 'type' => CRM_Utils_Type::T_STRING, ), 'financial_type_id' => - array('title' => ts('Financial Type'), + array('title' => ts('Financial Type'), 'operatorType' => CRM_Report_Form::OP_MULTISELECT, 'options' => CRM_Contribute_PseudoConstant::financialType(), 'type' => CRM_Utils_Type::T_INT, @@ -379,24 +377,24 @@ class CRM_Report_Form_Contribute_Summary extends CRM_Report_Form { function from() { $this->_from = " FROM civicrm_contact {$this->_aliases['civicrm_contact']} - INNER JOIN civicrm_contribution {$this->_aliases['civicrm_contribution']} + INNER JOIN civicrm_contribution {$this->_aliases['civicrm_contribution']} ON {$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_contribution']}.contact_id AND {$this->_aliases['civicrm_contribution']}.is_test = 0 - LEFT JOIN civicrm_financial_type {$this->_aliases['civicrm_financial_type']} + LEFT JOIN civicrm_financial_type {$this->_aliases['civicrm_financial_type']} ON {$this->_aliases['civicrm_contribution']}.financial_type_id ={$this->_aliases['civicrm_financial_type']}.id - LEFT JOIN civicrm_email {$this->_aliases['civicrm_email']} - ON ({$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_email']}.contact_id AND - {$this->_aliases['civicrm_email']}.is_primary = 1) - - LEFT JOIN civicrm_phone {$this->_aliases['civicrm_phone']} - ON ({$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_phone']}.contact_id AND + LEFT JOIN civicrm_email {$this->_aliases['civicrm_email']} + ON ({$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_email']}.contact_id AND + {$this->_aliases['civicrm_email']}.is_primary = 1) + + LEFT JOIN civicrm_phone {$this->_aliases['civicrm_phone']} + ON ({$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_phone']}.contact_id AND {$this->_aliases['civicrm_phone']}.is_primary = 1)"; if ($this->_addressField) { $this->_from .= " - LEFT JOIN civicrm_address {$this->_aliases['civicrm_address']} - ON {$this->_aliases['civicrm_contact']}.id = - {$this->_aliases['civicrm_address']}.contact_id AND + LEFT JOIN civicrm_address {$this->_aliases['civicrm_address']} + ON {$this->_aliases['civicrm_contact']}.id = + {$this->_aliases['civicrm_address']}.contact_id AND {$this->_aliases['civicrm_address']}.is_primary = 1\n"; } } @@ -455,7 +453,7 @@ class CRM_Report_Form_Contribute_Summary extends CRM_Report_Form { $select = " SELECT COUNT({$this->_aliases['civicrm_contribution']}.total_amount ) as count, SUM({$this->_aliases['civicrm_contribution']}.total_amount ) as amount, - ROUND(AVG({$this->_aliases['civicrm_contribution']}.total_amount), 2) as avg, {$this->_aliases['civicrm_contribution']}.currency as currency + ROUND(AVG({$this->_aliases['civicrm_contribution']}.total_amount), 2) as avg, {$this->_aliases['civicrm_contribution']}.currency as currency "; $group = "\nGROUP BY {$this->_aliases['civicrm_contribution']}.currency"; $sql = "{$select} {$this->_from} {$this->_where}{$group}"; diff --git a/CRM/Report/Form/Contribute/Sybunt.php b/CRM/Report/Form/Contribute/Sybunt.php index 8aede2e45e..72d35c49e0 100644 --- a/CRM/Report/Form/Contribute/Sybunt.php +++ b/CRM/Report/Form/Contribute/Sybunt.php @@ -1,6 +1,4 @@ activeCampaigns = $getCampaigns['campaigns']; asort($this->activeCampaigns); - } + } $this->_columns = array( 'civicrm_contact' => @@ -73,9 +71,9 @@ class CRM_Report_Form_Contribute_Sybunt extends CRM_Report_Form { array('title' => ts('Donor Name'), 'required' => TRUE, ), - 'first_name' => array('title' => ts('First Name'), + 'first_name' => array('title' => ts('First Name'), ), - 'last_name' => array('title' => ts('Last Name'), + 'last_name' => array('title' => ts('Last Name'), ), ), 'filters' => @@ -466,7 +464,7 @@ class CRM_Report_Form_Contribute_Sybunt extends CRM_Report_Form { $rows[$rowNum]['civicrm_contact_sort_name_link'] = $url; $rows[$rowNum]['civicrm_contact_sort_name_hover'] = ts("View Contribution Details for this Contact."); } - + // convert campaign_id to campaign title if (array_key_exists('civicrm_contribution_campaign_id', $row)) { if ($value = $row['civicrm_contribution_campaign_id']) { diff --git a/CRM/Report/Form/Event/ParticipantListCount.php b/CRM/Report/Form/Event/ParticipantListCount.php index 65202ef906..139da4d1e2 100644 --- a/CRM/Report/Form/Event/ParticipantListCount.php +++ b/CRM/Report/Form/Event/ParticipantListCount.php @@ -369,20 +369,20 @@ class CRM_Report_Form_Event_ParticipantListCount extends CRM_Report_Form_Event { function from() { $this->_from = " - FROM civicrm_participant {$this->_aliases['civicrm_participant']} - LEFT JOIN civicrm_event {$this->_aliases['civicrm_event']} - ON ({$this->_aliases['civicrm_event']}.id = {$this->_aliases['civicrm_participant']}.event_id ) AND ({$this->_aliases['civicrm_event']}.is_template IS NULL OR {$this->_aliases['civicrm_event']}.is_template = 0) - LEFT JOIN civicrm_contact {$this->_aliases['civicrm_contact']} - ON ({$this->_aliases['civicrm_participant']}.contact_id = {$this->_aliases['civicrm_contact']}.id ) - {$this->_aclFrom} - LEFT JOIN civicrm_contact {$this->_aliases['civicrm_employer']} - ON ({$this->_aliases['civicrm_employer']}.id = {$this->_aliases['civicrm_contact']}.employer_id ) - LEFT JOIN civicrm_address {$this->_aliases['civicrm_address']} - ON {$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_address']}.contact_id AND - {$this->_aliases['civicrm_address']}.is_primary = 1 - LEFT JOIN civicrm_email {$this->_aliases['civicrm_email']} - ON ({$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_email']}.contact_id AND - {$this->_aliases['civicrm_email']}.is_primary = 1) + FROM civicrm_participant {$this->_aliases['civicrm_participant']} + LEFT JOIN civicrm_event {$this->_aliases['civicrm_event']} + ON ({$this->_aliases['civicrm_event']}.id = {$this->_aliases['civicrm_participant']}.event_id ) AND ({$this->_aliases['civicrm_event']}.is_template IS NULL OR {$this->_aliases['civicrm_event']}.is_template = 0) + LEFT JOIN civicrm_contact {$this->_aliases['civicrm_contact']} + ON ({$this->_aliases['civicrm_participant']}.contact_id = {$this->_aliases['civicrm_contact']}.id ) + {$this->_aclFrom} + LEFT JOIN civicrm_contact {$this->_aliases['civicrm_employer']} + ON ({$this->_aliases['civicrm_employer']}.id = {$this->_aliases['civicrm_contact']}.employer_id ) + LEFT JOIN civicrm_address {$this->_aliases['civicrm_address']} + ON {$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_address']}.contact_id AND + {$this->_aliases['civicrm_address']}.is_primary = 1 + LEFT JOIN civicrm_email {$this->_aliases['civicrm_email']} + ON ({$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_email']}.contact_id AND + {$this->_aliases['civicrm_email']}.is_primary = 1) LEFT JOIN civicrm_phone {$this->_aliases['civicrm_phone']} ON {$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_phone']}.contact_id AND {$this->_aliases['civicrm_phone']}.is_primary = 1 diff --git a/CRM/Report/Form/Event/ParticipantListing.php b/CRM/Report/Form/Event/ParticipantListing.php index c54ab20249..9b802c6c3c 100644 --- a/CRM/Report/Form/Event/ParticipantListing.php +++ b/CRM/Report/Form/Event/ParticipantListing.php @@ -1,6 +1,4 @@ 'Link to Detail Report'); - function __construct() { - - // Check if CiviCampaign is a) enabled and b) has active campaigns - $config = CRM_Core_Config::singleton(); + function __construct() { + + // Check if CiviCampaign is a) enabled and b) has active campaigns + $config = CRM_Core_Config::singleton(); $campaignEnabled = in_array("CiviCampaign", $config->enableComponents); if ($campaignEnabled) { $getCampaigns = CRM_Campaign_BAO_Campaign::getPermissionedCampaigns(NULL, NULL, TRUE, FALSE, TRUE); $this->activeCampaigns = $getCampaigns['campaigns']; asort($this->activeCampaigns); } - + $this->_columns = array( 'civicrm_contact' => array( @@ -65,9 +63,9 @@ class CRM_Report_Form_Event_ParticipantListing extends CRM_Report_Form_Event { 'no_repeat' => TRUE, 'dbAlias' => 'contact_civireport.sort_name', ), - 'first_name' => array('title' => ts('First Name'), + 'first_name' => array('title' => ts('First Name'), ), - 'last_name' => array('title' => ts('Last Name'), + 'last_name' => array('title' => ts('Last Name'), ), 'id' => array( @@ -82,10 +80,10 @@ class CRM_Report_Form_Event_ParticipantListing extends CRM_Report_Form_Event { 'order_bys' => array( 'sort_name' => - array('title' => ts('Last Name, First Name'), - 'default' => '1', - 'default_weight' => '0', - 'default_order' => 'ASC', + array('title' => ts('Last Name, First Name'), + 'default' => '1', + 'default_weight' => '0', + 'default_order' => 'ASC', ), ), 'filters' => @@ -249,7 +247,7 @@ class CRM_Report_Form_Event_ParticipantListing extends CRM_Report_Form_Event { ), ), ); - + // If we have active campaigns add those elements to both the fields and filters if ($campaignEnabled && !empty($this->activeCampaigns)) { $this->_columns['civicrm_participant']['fields']['campaign_id'] = array( @@ -263,11 +261,11 @@ class CRM_Report_Form_Event_ParticipantListing extends CRM_Report_Form_Event { $this->_columns['civicrm_participant']['order_bys']['campaign_id'] = array('title' => ts('Campaign')); } - + $this->_currencyColumn = 'civicrm_participant_fee_currency'; parent::__construct(); } - + function preProcess() { parent::preProcess(); @@ -278,7 +276,7 @@ class CRM_Report_Form_Event_ParticipantListing extends CRM_Report_Form_Event { $this->_columnHeaders = array(); //add blank column at the Start - if (array_key_exists('options', $this->_params) && + if (array_key_exists('options', $this->_params) && CRM_Utils_Array::value('blank_column_begin', $this->_params['options'])) { $select[] = " '' as blankColumnBegin"; $this->_columnHeaders['blankColumnBegin']['title'] = '_ _ _ _'; @@ -319,23 +317,23 @@ class CRM_Report_Form_Event_ParticipantListing extends CRM_Report_Form_Event { function from() { $this->_from = " FROM civicrm_participant {$this->_aliases['civicrm_participant']} - LEFT JOIN civicrm_event {$this->_aliases['civicrm_event']} - ON ({$this->_aliases['civicrm_event']}.id = {$this->_aliases['civicrm_participant']}.event_id ) AND - ({$this->_aliases['civicrm_event']}.is_template IS NULL OR + LEFT JOIN civicrm_event {$this->_aliases['civicrm_event']} + ON ({$this->_aliases['civicrm_event']}.id = {$this->_aliases['civicrm_participant']}.event_id ) AND + ({$this->_aliases['civicrm_event']}.is_template IS NULL OR {$this->_aliases['civicrm_event']}.is_template = 0) - LEFT JOIN civicrm_contact {$this->_aliases['civicrm_contact']} + LEFT JOIN civicrm_contact {$this->_aliases['civicrm_contact']} ON ({$this->_aliases['civicrm_participant']}.contact_id = {$this->_aliases['civicrm_contact']}.id ) {$this->_aclFrom} LEFT JOIN civicrm_address {$this->_aliases['civicrm_address']} - ON {$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_address']}.contact_id AND - {$this->_aliases['civicrm_address']}.is_primary = 1 - LEFT JOIN civicrm_email {$this->_aliases['civicrm_email']} + ON {$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_address']}.contact_id AND + {$this->_aliases['civicrm_address']}.is_primary = 1 + LEFT JOIN civicrm_email {$this->_aliases['civicrm_email']} ON ({$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_email']}.contact_id AND - {$this->_aliases['civicrm_email']}.is_primary = 1) - LEFT JOIN civicrm_phone {$this->_aliases['civicrm_phone']} + {$this->_aliases['civicrm_email']}.is_primary = 1) + LEFT JOIN civicrm_phone {$this->_aliases['civicrm_phone']} ON {$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_phone']}.contact_id AND - {$this->_aliases['civicrm_phone']}.is_primary = 1 - "; + {$this->_aliases['civicrm_phone']}.is_primary = 1 + "; } function where() { diff --git a/CRM/Report/Form/Instance.php b/CRM/Report/Form/Instance.php index 5e5b8965c0..9b4cefb8ac 100644 --- a/CRM/Report/Form/Instance.php +++ b/CRM/Report/Form/Instance.php @@ -1,6 +1,4 @@ getVar('_id'); $isNew = $form->getVar('_createNew'); $isCopy = 0; - + if ($instanceID) { if (!$isNew) { // updating an existing report instance - $dao->id = $instanceID; + $dao->id = $instanceID; } else { // making a copy of an existing instance $isCopy = 1; @@ -401,7 +399,7 @@ class CRM_Report_Form_Instance { $instanceUrl = CRM_Utils_System::url("civicrm/report/instance/{$dao->id}", "reset=1" ); - + CRM_Core_Session::setStatus($statusMsg); if ( $redirect ) { diff --git a/CRM/Report/Form/Member/Detail.php b/CRM/Report/Form/Member/Detail.php index b9181c269e..5f357dc118 100644 --- a/CRM/Report/Form/Member/Detail.php +++ b/CRM/Report/Form/Member/Detail.php @@ -1,6 +1,4 @@ enableComponents); if ($campaignEnabled) { $getCampaigns = CRM_Campaign_BAO_Campaign::getPermissionedCampaigns(NULL, NULL, TRUE, FALSE, TRUE); $this->activeCampaigns = $getCampaigns['campaigns']; asort($this->activeCampaigns); } - + $this->_columns = array( 'civicrm_contact' => array( @@ -276,7 +274,7 @@ class CRM_Report_Form_Member_Detail extends CRM_Report_Form { $this->_groupFilter = TRUE; $this->_tagFilter = TRUE; - // If we have active campaigns add those elements to both the fields and filters + // If we have active campaigns add those elements to both the fields and filters if ($campaignEnabled && !empty($this->activeCampaigns)) { $this->_columns['civicrm_membership']['fields']['campaign_id'] = array( 'title' => ts('Campaign'), @@ -338,49 +336,49 @@ class CRM_Report_Form_Member_Detail extends CRM_Report_Form { $this->_from = " FROM civicrm_contact {$this->_aliases['civicrm_contact']} {$this->_aclFrom} - INNER JOIN civicrm_membership {$this->_aliases['civicrm_membership']} - ON {$this->_aliases['civicrm_contact']}.id = + INNER JOIN civicrm_membership {$this->_aliases['civicrm_membership']} + ON {$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_membership']}.contact_id AND {$this->_aliases['civicrm_membership']}.is_test = 0 LEFT JOIN civicrm_membership_status {$this->_aliases['civicrm_membership_status']} - ON {$this->_aliases['civicrm_membership_status']}.id = + ON {$this->_aliases['civicrm_membership_status']}.id = {$this->_aliases['civicrm_membership']}.status_id "; //used when address field is selected if ($this->_addressField) { $this->_from .= " - LEFT JOIN civicrm_address {$this->_aliases['civicrm_address']} - ON {$this->_aliases['civicrm_contact']}.id = - {$this->_aliases['civicrm_address']}.contact_id AND + LEFT JOIN civicrm_address {$this->_aliases['civicrm_address']} + ON {$this->_aliases['civicrm_contact']}.id = + {$this->_aliases['civicrm_address']}.contact_id AND {$this->_aliases['civicrm_address']}.is_primary = 1\n"; } //used when email field is selected if ($this->_emailField) { $this->_from .= " - LEFT JOIN civicrm_email {$this->_aliases['civicrm_email']} - ON {$this->_aliases['civicrm_contact']}.id = - {$this->_aliases['civicrm_email']}.contact_id AND + LEFT JOIN civicrm_email {$this->_aliases['civicrm_email']} + ON {$this->_aliases['civicrm_contact']}.id = + {$this->_aliases['civicrm_email']}.contact_id AND {$this->_aliases['civicrm_email']}.is_primary = 1\n"; } //used when phone field is selected if ($this->_phoneField) { $this->_from .= " - LEFT JOIN civicrm_phone {$this->_aliases['civicrm_phone']} - ON {$this->_aliases['civicrm_contact']}.id = - {$this->_aliases['civicrm_phone']}.contact_id AND + LEFT JOIN civicrm_phone {$this->_aliases['civicrm_phone']} + ON {$this->_aliases['civicrm_contact']}.id = + {$this->_aliases['civicrm_phone']}.contact_id AND {$this->_aliases['civicrm_phone']}.is_primary = 1\n"; } //used when contribution field is selected if ($this->_contribField) { $this->_from .= " LEFT JOIN ( - SELECT cc.*, cmp.membership_id as membership_id + SELECT cc.*, cmp.membership_id as membership_id FROM civicrm_membership_payment cmp - JOIN civicrm_contribution cc - ON cc.id = cmp.contribution_id + JOIN civicrm_contribution cc + ON cc.id = cmp.contribution_id ORDER BY cc.receive_date DESC - ) {$this->_aliases['civicrm_contribution']} - ON {$this->_aliases['civicrm_membership']}.id = + ) {$this->_aliases['civicrm_contribution']} + ON {$this->_aliases['civicrm_membership']}.id = {$this->_aliases['civicrm_contribution']}.membership_id\n"; } } @@ -453,11 +451,11 @@ class CRM_Report_Form_Member_Detail extends CRM_Report_Form { // custom code to alter rows $entryFound = FALSE; $checkList = array(); - + $contributionTypes = CRM_Contribute_PseudoConstant::financialType(); $contributionStatus = CRM_Contribute_PseudoConstant::contributionStatus(); $paymentInstruments = CRM_Contribute_PseudoConstant::paymentInstrument(); - + foreach ($rows as $rowNum => $row) { if (!empty($this->_noRepeats) && $this->_outputMode != 'csv') { @@ -511,7 +509,7 @@ class CRM_Report_Form_Member_Detail extends CRM_Report_Form { $rows[$rowNum]['civicrm_contact_sort_name_hover'] = ts("View Contact Summary for this Contact."); $entryFound = TRUE; } - + if ($value = CRM_Utils_Array::value('civicrm_contribution_financial_type_id', $row)) { $rows[$rowNum]['civicrm_contribution_financial_type_id'] = $contributionTypes[$value]; $entryFound = TRUE; diff --git a/CRM/Report/Form/Member/Lapse.php b/CRM/Report/Form/Member/Lapse.php index 01c69c0b95..4605aa8f5b 100644 --- a/CRM/Report/Form/Member/Lapse.php +++ b/CRM/Report/Form/Member/Lapse.php @@ -1,6 +1,4 @@ 'Tabular'); protected $_customGroupExtends = array( - 'Membership'); + 'Membership'); public $_drilldownReport = array('member/detail' => 'Link to Detail Report'); - + function __construct() { // Check if CiviCampaign is a) enabled and b) has active campaigns @@ -54,7 +52,7 @@ class CRM_Report_Form_Member_Lapse extends CRM_Report_Form { $getCampaigns = CRM_Campaign_BAO_Campaign::getPermissionedCampaigns(NULL, NULL, TRUE, FALSE, TRUE); $this->activeCampaigns = $getCampaigns['campaigns']; asort($this->activeCampaigns); - } + } // UI for selecting columns to appear in the report list // array conatining the columns, group_bys and filters build and provided to Form @@ -210,7 +208,7 @@ class CRM_Report_Form_Member_Lapse extends CRM_Report_Form { 'operatorType' => CRM_Report_Form::OP_MULTISELECT, 'options' => $this->activeCampaigns, ); - } + } $this->_tagFilter = TRUE; parent::__construct(); @@ -262,35 +260,35 @@ class CRM_Report_Form_Member_Lapse extends CRM_Report_Form { $this->_from = " FROM civicrm_contact {$this->_aliases['civicrm_contact']} {$this->_aclFrom} - INNER JOIN civicrm_membership {$this->_aliases['civicrm_membership']} - ON {$this->_aliases['civicrm_contact']}.id = + INNER JOIN civicrm_membership {$this->_aliases['civicrm_membership']} + ON {$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_membership']}.contact_id AND {$this->_aliases['civicrm_membership']}.is_test = 0 LEFT JOIN civicrm_membership_status {$this->_aliases['civicrm_membership_status']} - ON {$this->_aliases['civicrm_membership_status']}.id = + ON {$this->_aliases['civicrm_membership_status']}.id = {$this->_aliases['civicrm_membership']}.status_id - LEFT JOIN civicrm_membership_type {$this->_aliases['civicrm_membership_type']} + LEFT JOIN civicrm_membership_type {$this->_aliases['civicrm_membership_type']} ON {$this->_aliases['civicrm_membership']}.membership_type_id = {$this->_aliases['civicrm_membership_type']}.id"; // include address field if address column is to be included if ($this->_addressField) { $this->_from .= " - LEFT JOIN civicrm_address {$this->_aliases['civicrm_address']} + LEFT JOIN civicrm_address {$this->_aliases['civicrm_address']} ON {$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_address']}.contact_id AND {$this->_aliases['civicrm_address']}.is_primary = 1\n"; } // include email field if email column is to be included if ($this->_emailField) { $this->_from .= " - LEFT JOIN civicrm_email {$this->_aliases['civicrm_email']} + LEFT JOIN civicrm_email {$this->_aliases['civicrm_email']} ON {$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_email']}.contact_id AND {$this->_aliases['civicrm_email']}.is_primary = 1\n"; } // include phone field if phone column is to be included if ($this->_phoneField) { $this->_from .= " - LEFT JOIN civicrm_phone {$this->_aliases['civicrm_phone']} - ON {$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_phone']}.contact_id + LEFT JOIN civicrm_phone {$this->_aliases['civicrm_phone']} + ON {$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_phone']}.contact_id AND {$this->_aliases['civicrm_phone']}.is_primary = 1\n"; } } diff --git a/CRM/Report/Form/Member/Summary.php b/CRM/Report/Form/Member/Summary.php index 7125514075..7f26933f7c 100644 --- a/CRM/Report/Form/Member/Summary.php +++ b/CRM/Report/Form/Member/Summary.php @@ -1,6 +1,4 @@ 'Link to Detail Report'); - function __construct() { - + function __construct() { + // UI for selecting columns to appear in the report list // Array containing the columns, group_bys and filters build and provided to Form - // Check if CiviCampaign is a) enabled and b) has active campaigns - $config = CRM_Core_Config::singleton(); + // Check if CiviCampaign is a) enabled and b) has active campaigns + $config = CRM_Core_Config::singleton(); $campaignEnabled = in_array("CiviCampaign", $config->enableComponents); if ($campaignEnabled) { $getCampaigns = CRM_Campaign_BAO_Campaign::getPermissionedCampaigns(NULL, NULL, TRUE, FALSE, TRUE); @@ -174,7 +172,7 @@ class CRM_Report_Form_Member_Summary extends CRM_Report_Form { ), ); $this->_tagFilter = TRUE; - + // If we have a campaign, build out the relevant elements if ($campaignEnabled && !empty($this->activeCampaigns)) { $this->_columns['civicrm_membership']['fields']['campaign_id'] = array( @@ -188,8 +186,8 @@ class CRM_Report_Form_Member_Summary extends CRM_Report_Form { $this->_columns['civicrm_membership']['grouping']['campaign_id'] = 'contri-fields'; $this->_columns['civicrm_membership']['group_bys']['campaign_id'] = array('title' => ts('Campaign')); } - - + + $this->_groupFilter = TRUE; $this->_currencyColumn = 'civicrm_contribution_currency'; parent::__construct(); @@ -326,14 +324,14 @@ class CRM_Report_Form_Member_Summary extends CRM_Report_Form { function from() { $this->_from = " FROM civicrm_membership {$this->_aliases['civicrm_membership']} - - LEFT JOIN civicrm_contact {$this->_aliases['civicrm_contact']} ON ( {$this->_aliases['civicrm_membership']}.contact_id = {$this->_aliases['civicrm_contact']}.id ) - - LEFT JOIN civicrm_membership_status + + LEFT JOIN civicrm_contact {$this->_aliases['civicrm_contact']} ON ( {$this->_aliases['civicrm_membership']}.contact_id = {$this->_aliases['civicrm_contact']}.id ) + + LEFT JOIN civicrm_membership_status ON ({$this->_aliases['civicrm_membership']}.status_id = civicrm_membership_status.id ) LEFT JOIN civicrm_membership_payment payment ON ( {$this->_aliases['civicrm_membership']}.id = payment.membership_id ) - LEFT JOIN civicrm_contribution {$this->_aliases['civicrm_contribution']} + LEFT JOIN civicrm_contribution {$this->_aliases['civicrm_contribution']} ON payment.contribution_id = {$this->_aliases['civicrm_contribution']}.id"; } // end of from @@ -432,11 +430,11 @@ class CRM_Report_Form_Member_Summary extends CRM_Report_Form { "; $sql = "{$select} {$this->_from} {$this->_where} -GROUP BY {$this->_aliases['civicrm_contribution']}.currency +GROUP BY {$this->_aliases['civicrm_contribution']}.currency "; $dao = CRM_Core_DAO::executeQuery($sql); - + $totalAmount = $average = array(); $count = $memberCount = 0; while ($dao->fetch()) { @@ -639,8 +637,8 @@ GROUP BY {$this->_aliases['civicrm_contribution']}.currency $rows[$rowNum]['civicrm_membership_membership_type_id'] = 'SubTotal'; $entryFound = TRUE; } - - + + // If using campaigns, convert campaign_id to campaign title if (array_key_exists('civicrm_membership_campaign_id', $row)) { if ($value = $row['civicrm_membership_campaign_id']) { diff --git a/CRM/Report/Form/Pledge/Detail.php b/CRM/Report/Form/Pledge/Detail.php index 049a92e5d7..62fec93fb6 100644 --- a/CRM/Report/Form/Pledge/Detail.php +++ b/CRM/Report/Form/Pledge/Detail.php @@ -1,6 +1,4 @@ _columns['civicrm_pledge']['fields']['campaign_id'] = array( 'title' => 'Campaign', 'default' => 'false', - ); + ); $this->_columns['civicrm_pledge']['filters']['campaign_id'] = array('title' => ts('Campaign'), 'operatorType' => CRM_Report_Form::OP_MULTISELECT, 'options' => $this->activeCampaigns, - ); + ); } $this->_tagFilter = TRUE; diff --git a/CRM/Report/Info.php b/CRM/Report/Info.php index 94542eb201..a63406ff16 100644 --- a/CRM/Report/Info.php +++ b/CRM/Report/Info.php @@ -1,6 +1,4 @@ -

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.4.alpha1.msg_template/message_templates/event_online_receipt_text.tpl b/CRM/Upgrade/4.4.alpha1.msg_template/message_templates/event_online_receipt_text.tpl index ccaf777476..ffc380b196 100644 --- a/CRM/Upgrade/4.4.alpha1.msg_template/message_templates/event_online_receipt_text.tpl +++ b/CRM/Upgrade/4.4.alpha1.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/FourTwo.php b/CRM/Upgrade/Incremental/php/FourTwo.php index 6e31caa8c7..77659f1f03 100644 --- a/CRM/Upgrade/Incremental/php/FourTwo.php +++ b/CRM/Upgrade/Incremental/php/FourTwo.php @@ -130,7 +130,7 @@ INNER JOIN civicrm_price_set cps ON cps.id = cpf.price_set_id AND cps.name <>'de $dao = CRM_Core_DAO::executeQuery($sql); if ($dao->fetch()) { $errors = ts("We found unexpected data values from an older version of CiviCRM in your database. The upgrade can not be run until this condition is corrected.

Details: One or more rows are present in the civicrm_option_group with name like 'civicrm_price_field.amount.%'. Check here for information on diagnosing and correcting this problem.", array(1 => 'http://forum.civicrm.org/index.php/topic,27744.msg118748.html#msg118748')); - CRM_Core_Error::fatal($errors); + CRM_Core_Error::fatal($errors); return FALSE; } } @@ -485,7 +485,7 @@ WHERE cpse.price_set_id IS NULL"; $fieldParams['option_label'] = $optionValue['label']; $fieldParams['option_amount'] = $optionValue['value']; $fieldParams['option_weight'] = $optionValue['weight']; - $fieldParams['is_quick_config'] = $setParams['is_quick_config']; + $fieldParams['is_quick_config'] = $setParams['is_quick_config']; if ($defaultAmount = CRM_Core_DAO::getFieldValue($daoName[$addTo[0]][0], $addTo[2], $defaultAmountColumn)) { $fieldParams['default_option'] = array_search($defaultAmount, $optionValue['amount_id']); } diff --git a/CRM/Upgrade/Incremental/sql/4.3.3.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.3.3.mysql.tpl index 0b75a6dd19..4753fab7f1 100644 --- a/CRM/Upgrade/Incremental/sql/4.3.3.mysql.tpl +++ b/CRM/Upgrade/Incremental/sql/4.3.3.mysql.tpl @@ -1,2 +1,2 @@ --- CRM-12501 +-- CRM-12501 ALTER TABLE civicrm_financial_account CHANGE `tax_rate` `tax_rate` DECIMAL( 10, 8 ) NULL DEFAULT NULL COMMENT 'The percentage of the total_amount that is due for this tax.'; diff --git a/CRM/Utils/Cache/SqlGroup.php b/CRM/Utils/Cache/SqlGroup.php index c8c083c543..60b5edca51 100644 --- a/CRM/Utils/Cache/SqlGroup.php +++ b/CRM/Utils/Cache/SqlGroup.php @@ -51,7 +51,7 @@ class CRM_Utils_Cache_SqlGroup implements CRM_Utils_Cache_Interface { * @var int $componentID The optional component ID (so componenets can share the same name space) */ protected $componentID; - + /** * @var array in-memory cache to optimize redundant get()s */ diff --git a/CRM/Utils/DeprecatedUtils.php b/CRM/Utils/DeprecatedUtils.php index 97155f5b09..89ad87d651 100644 --- a/CRM/Utils/DeprecatedUtils.php +++ b/CRM/Utils/DeprecatedUtils.php @@ -1,6 +1,4 @@ {ts}"Please tell me what you would like to discuss."{/ts}
  • {ts}Reflect client's story back to them.{/ts}
  • {ts}Guess client's feelings and needs.{/ts}
    • -
  • {ts}"May I now ask you some screening questions?"{/ts}
    • +
  • {ts}"May I now ask you some screening questions?"{/ts}
    • {else} {ts}Record details about this activity here.{/ts} diff --git a/templates/CRM/Case/Form/CustomData.tpl b/templates/CRM/Case/Form/CustomData.tpl index 5acc845f10..bbe4f8cce5 100644 --- a/templates/CRM/Case/Form/CustomData.tpl +++ b/templates/CRM/Case/Form/CustomData.tpl @@ -26,5 +26,5 @@
    {include file="CRM/Custom/Form/CustomData.tpl"} -
    {$form.buttons.html}
    +
    {$form.buttons.html}
    diff --git a/templates/CRM/Case/Form/Search/AdvancedSearchPane.tpl b/templates/CRM/Case/Form/Search/AdvancedSearchPane.tpl index 486068e3f7..eb5cf86e3c 100644 --- a/templates/CRM/Case/Form/Search/AdvancedSearchPane.tpl +++ b/templates/CRM/Case/Form/Search/AdvancedSearchPane.tpl @@ -25,7 +25,7 @@ *} {if $validCiviCase} diff --git a/templates/CRM/Case/Form/Task.tpl b/templates/CRM/Case/Form/Task.tpl index c5559d7f59..4e199c583d 100644 --- a/templates/CRM/Case/Form/Task.tpl +++ b/templates/CRM/Case/Form/Task.tpl @@ -25,7 +25,7 @@ *} {ts 1=$totalSelectedCases}Number of selected cases: %1{/ts} -{if $rows } +{if $rows }
    diff --git a/templates/CRM/Case/Form/Task/Delete.tpl b/templates/CRM/Case/Form/Task/Delete.tpl index f92c11c75a..5d2b0ae403 100644 --- a/templates/CRM/Case/Form/Task/Delete.tpl +++ b/templates/CRM/Case/Form/Task/Delete.tpl @@ -28,7 +28,7 @@
     {ts}Are you sure you want to delete the selected cases? This will move the case(s) and all associated activities to the Trash.{/ts}

    {include file="CRM/Case/Form/Task.tpl"}

    - +
    diff --git a/templates/CRM/common/Filter.tpl b/templates/CRM/common/Filter.tpl index 4ca4f158dc..59324e7361 100644 --- a/templates/CRM/common/Filter.tpl +++ b/templates/CRM/common/Filter.tpl @@ -29,7 +29,7 @@ var stregexp = new RegExp; function initFilter( id ) { //build the array filterArray = new Array(); - filterArray = {/literal}{$tokens}{literal}; + filterArray = {/literal}{$tokens}{literal}; tempArray = new Array(); remvdArray = new Array(); diff --git a/templates/CRM/common/SectionNav.tpl b/templates/CRM/common/SectionNav.tpl index 3df2e8c932..b5877bb679 100644 --- a/templates/CRM/common/SectionNav.tpl +++ b/templates/CRM/common/SectionNav.tpl @@ -39,7 +39,7 @@ {/if} {* Skip "Submit Application" category - it is shown separately *} {if $step.title NEQ 'Submit Application'} - {* step.link value is passed for section usages which allow clickable navigation AND when section state is clickable *} + {* step.link value is passed for section usages which allow clickable navigation AND when section state is clickable *}
  • {if $step.link && !$step.current}{/if}{$step.title}{if $step.link && !$step.current}{/if}
    • {if $step.current} {include file="CRM/common/WizardHeader.tpl"} diff --git a/templates/CRM/common/SocialNetwork.tpl b/templates/CRM/common/SocialNetwork.tpl index 8141206414..3f529acd0f 100644 --- a/templates/CRM/common/SocialNetwork.tpl +++ b/templates/CRM/common/SocialNetwork.tpl @@ -28,7 +28,7 @@

    {ts}Help spread the word{/ts}

    - {ts}Please help us and let your friends, colleagues and followers know about our page{/ts}{if $title}: + {ts}Please help us and let your friends, colleagues and followers know about our page{/ts}{if $title}: {$title} {else}.{/if}
    @@ -45,7 +45,7 @@ {*use advanced buttons for pages*}
    @@ -53,7 +53,7 @@
    -
    diff --git a/templates/CRM/common/batchCopy.tpl b/templates/CRM/common/batchCopy.tpl index ed3897d789..c6e883638f 100644 --- a/templates/CRM/common/batchCopy.tpl +++ b/templates/CRM/common/batchCopy.tpl @@ -140,7 +140,7 @@ } else { if (elementId.is('select') === true && firstElement.parent().find(':input').select().index() >= 1) { - // its a multiselect case + // its a multiselect case firstElement.parent().find(':input').select().each( function(count) { var firstElementValue = cj(this).val(); var elementId = cj('.crm-copy-fields [name^="field["][name*="[' + fname +'][' + count + '"][type!=hidden]'); diff --git a/templates/CRM/common/commonCSS.tpl b/templates/CRM/common/commonCSS.tpl index 3df0934c90..189fe1a1b4 100644 --- a/templates/CRM/common/commonCSS.tpl +++ b/templates/CRM/common/commonCSS.tpl @@ -30,7 +30,7 @@ - {/if} + {/if} {elseif $config->userFramework eq 'Joomla'} diff --git a/templates/CRM/common/dashboard.tpl b/templates/CRM/common/dashboard.tpl index 6549502590..4f139b5413 100644 --- a/templates/CRM/common/dashboard.tpl +++ b/templates/CRM/common/dashboard.tpl @@ -25,7 +25,7 @@ *} {literal} + diff --git a/templates/CRM/common/stateCountry.tpl b/templates/CRM/common/stateCountry.tpl index 3cbe1558c5..b5631a3ca2 100644 --- a/templates/CRM/common/stateCountry.tpl +++ b/templates/CRM/common/stateCountry.tpl @@ -43,25 +43,25 @@ callbackURL = {/literal}"{crmURL p='civicrm/ajax/jqState' h=0}"{literal} - cj( '#' + countryID ).chainSelect( - '#' + stateProvinceID, - callbackURL, - { + cj( '#' + countryID ).chainSelect( + '#' + stateProvinceID, + callbackURL, + { before : function (target) { if (typeof(setdefault) === "undefined") { setdefault = new Array(); } targetid = cj(target).attr("id"); eval('setdefault[targetid] = cj(target).val()'); }, - after : function(target) { + after : function(target) { targetid = cj(target).attr("id"); - cj(target).val(setdefault[targetid]); - } + cj(target).val(setdefault[targetid]); + } } ); }); {/literal} {/if} - + {if $stateCountryMap.state_province && $stateCountryMap.county} {literal} cj(function() { @@ -76,18 +76,18 @@ } callbackURL = {/literal}"{crmURL p='civicrm/ajax/jqCounty' h=0}"{literal} - + cj( '#' + stateProvinceID ).chainSelect( '#' + countyID, callbackURL, - { + { before : function (target) { if (typeof(setdefault) === "undefined") { setdefault = new Array(); } targetid = cj(target).attr("id"); eval('setdefault[targetid] = cj(target).val()'); }, - after : function(target) { + after : function(target) { targetid = cj(target).attr("id"); - cj(target).val(setdefault[targetid]); - } + cj(target).val(setdefault[targetid]); + } } ); }); diff --git a/tests/phpunit/api/v3/RelationshipTest.php b/tests/phpunit/api/v3/RelationshipTest.php index 05735fc824..1f34d39b4e 100644 --- a/tests/phpunit/api/v3/RelationshipTest.php +++ b/tests/phpunit/api/v3/RelationshipTest.php @@ -1,6 +1,4 @@ id - Campaign ID + Campaign ID int unsigned true Unique Campaign ID. @@ -22,7 +22,7 @@ name - Campaign Name + Campaign Name varchar 255 true @@ -41,16 +41,16 @@ 3.3 - - description - Campaign Description - text + + description + Campaign Description + text textarea 8 60 Full description of Campaign. - 3.3 - + 3.3 + start_date @@ -72,23 +72,23 @@ 3.3 - - campaign_type_id - Campaign Type ID - int unsigned - NULL + + campaign_type_id + Campaign Type ID + int unsigned + NULL Campaign Type ID.Implicit FK to civicrm_option_value where option_group = campaign_type true - 3.3 - + 3.3 + UI_campaign_type_id campaign_type_id 3.3 - - status_id + + status_id Campaign Status ID int unsigned NULL @@ -135,13 +135,13 @@ SET NULL - - is_active + + is_active boolean - 1 - Is this Campaign enabled or disabled/cancelled? - 3.3 - + 1 + Is this Campaign enabled or disabled/cancelled? + 3.3 + created_id @@ -185,17 +185,17 @@ Date and time that Campaign was edited last time. 3.3 - - goal_general - text - Campaign Goals + + goal_general + text + Campaign Goals General goals for Campaign. - 3.4 - + 3.4 + - goal_revenue - decimal - The target revenue for this campaign. - 3.4 + goal_revenue + decimal + The target revenue for this campaign. + 3.4
    diff --git a/xml/schema/Campaign/Survey.xml b/xml/schema/Campaign/Survey.xml index 961763c78d..3faa1a2dc6 100644 --- a/xml/schema/Campaign/Survey.xml +++ b/xml/schema/Campaign/Survey.xml @@ -5,7 +5,7 @@ civicrm_survey Campaign Survey Details. 3.2 - + id int unsigned @@ -20,7 +20,7 @@ title - Survey Title + Survey Title varchar 255 true @@ -32,7 +32,7 @@ campaign_id int unsigned - NULL + NULL Foreign key to the Campaign. 3.3 @@ -43,15 +43,15 @@ 3.3 SET NULL - + activity_type_id - Activity Type ID - int unsigned - NULL + Activity Type ID + int unsigned + NULL Implicit FK to civicrm_option_value where option_group = activity_type true - 3.3 + 3.3 UI_activity_type_id @@ -68,7 +68,7 @@ 80 3.3 - + instructions text @@ -86,41 +86,41 @@ Number of days for recurrence of release. 3.3 - - + + max_number_of_contacts Maximum number of contacts - int unsigned + int unsigned NULL - Maximum number of contacts to allow for survey. + Maximum number of contacts to allow for survey. 3.3 - - + + default_number_of_contacts Default number of contacts - int unsigned + int unsigned NULL - Default number of contacts to allow for survey. + Default number of contacts to allow for survey. 3.3 - - - is_active + + + is_active boolean - 1 - Is this survey enabled or disabled/cancelled? - 3.3 + 1 + Is this survey enabled or disabled/cancelled? + 3.3 - - - is_default + + + is_default boolean - 0 - Is this default survey? - 3.3 - - + 0 + Is this default survey? + 3.3 + + created_id int unsigned @@ -134,7 +134,7 @@ 3.3 SET NULL - + created_date datetime @@ -142,7 +142,7 @@ Date and time that Survey was created. 3.3 - + last_modified_id int unsigned @@ -156,7 +156,7 @@ 3.3 SET NULL - + last_modified_date datetime -- 2.25.1